OSDN Git Service

sbc: Declare and implement sbc_init_msbc
[android-x86/external-bluetooth-sbc.git] / sbc / sbc.c
index ad391bd..cea2dd1 100644 (file)
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -6,6 +6,7 @@
  *  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
@@ -40,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 {
@@ -493,26 +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) {
-                                       uint32_t shift =
-                                               frame->scale_factor[ch][sb] +
+                               uint32_t shift;
+
+                               if (levels[ch][sb] == 0) {
+                                       frame->sb_sample[blk][ch][sb] = 0;
+                                       continue;
+                               }
+
+                               shift = frame->scale_factor[ch][sb] +
                                                1 + SBCDEC_FIXED_EXTRA_BITS;
-                                       audio_sample = 0;
-                                       for (bit = 0; bit < bits[ch][sb]; bit++) {
-                                               if (consumed > len * 8)
-                                                       return -1;
 
-                                               if ((data[consumed >> 3] >> (7 - (consumed & 0x7))) & 0x01)
-                                                       audio_sample |= 1 << (bits[ch][sb] - bit - 1);
+                               audio_sample = 0;
+                               for (bit = 0; bit < bits[ch][sb]; bit++) {
+                                       if (consumed > len * 8)
+                                               return -1;
 
-                                               consumed++;
-                                       }
+                                       if ((data[consumed >> 3] >> (7 - (consumed & 0x7))) & 0x01)
+                                               audio_sample |= 1 << (bits[ch][sb] - bit - 1);
 
-                                       frame->sb_sample[blk][ch][sb] = (int32_t)
-                                               (((((uint64_t) audio_sample << 1) | 1) << shift) /
-                                               levels[ch][sb]) - (1 << shift);
-                               } else
-                                       frame->sb_sample[blk][ch][sb] = 0;
+                                       consumed++;
+                               }
+
+                               frame->sb_sample[blk][ch][sb] = (int32_t)
+                                       (((((uint64_t) audio_sample << 1) | 1) << shift) /
+                                       levels[ch][sb]) - (1 << shift);
                        }
                }
        }
@@ -683,30 +693,32 @@ static int sbc_analyze_audio(struct sbc_encoder_state *state,
        switch (frame->subbands) {
        case 4:
                for (ch = 0; ch < frame->channels; ch++) {
-                       x = &state->X[ch][state->position - 16 +
-                                                       frame->blocks * 4];
-                       for (blk = 0; blk < frame->blocks; blk += 4) {
-                               state->sbc_analyze_4b_4s(
-                                       x,
+                       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]);
-                               x -= 16;
+                               x -= 4 * state->increment;
                        }
                }
                return frame->blocks * 4;
 
        case 8:
                for (ch = 0; ch < frame->channels; ch++) {
-                       x = &state->X[ch][state->position - 32 +
-                                                       frame->blocks * 8];
-                       for (blk = 0; blk < frame->blocks; blk += 4) {
-                               state->sbc_analyze_4b_8s(
-                                       x,
+                       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]);
-                               x -= 32;
+                               x -= 8 * state->increment;
                        }
                }
                return frame->blocks * 8;
@@ -896,17 +908,22 @@ static ssize_t sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len
        }
 }
 
-static void sbc_encoder_init(struct sbc_encoder_state *state,
-                                       const struct sbc_frame *frame)
+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->position = (SBC_X_BUFFER_SIZE - frame->subbands * 9) & ~7;
+       if (msbc)
+               state->increment = 1;
+       else
+               state->increment = 4;
 
        sbc_init_primitives(state);
 }
 
 struct sbc_priv {
        int init;
+       bool msbc;
        struct SBC_ALIGNED sbc_frame frame;
        struct SBC_ALIGNED sbc_decoder_state dec_state;
        struct SBC_ALIGNED sbc_encoder_state enc_state;
@@ -914,6 +931,7 @@ struct sbc_priv {
 
 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;
@@ -928,7 +946,7 @@ 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;
@@ -949,12 +967,45 @@ int sbc_init(sbc_t *sbc, unsigned long flags)
        return 0;
 }
 
-ssize_t sbc_parse(sbc_t *sbc, const void *input, size_t 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);
 }
 
-ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len,
+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;
@@ -1023,7 +1074,7 @@ ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len,
        return framelen;
 }
 
-ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len,
+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;
@@ -1049,12 +1100,15 @@ ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len,
                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);
@@ -1112,7 +1166,7 @@ ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len,
        return samples * priv->frame.channels * 2;
 }
 
-void sbc_finish(sbc_t *sbc)
+SBC_EXPORT void sbc_finish(sbc_t *sbc)
 {
        if (!sbc)
                return;
@@ -1122,7 +1176,7 @@ void sbc_finish(sbc_t *sbc)
        memset(sbc, 0, sizeof(sbc_t));
 }
 
-size_t 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, bitpool;
@@ -1133,7 +1187,10 @@ size_t sbc_get_frame_length(sbc_t *sbc)
                return priv->frame.length;
 
        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;
        joint = sbc->mode == SBC_MODE_JOINT_STEREO ? 1 : 0;
        bitpool = sbc->bitpool;
@@ -1148,7 +1205,7 @@ size_t sbc_get_frame_length(sbc_t *sbc)
        return ret;
 }
 
-unsigned sbc_get_frame_duration(sbc_t *sbc)
+SBC_EXPORT unsigned sbc_get_frame_duration(sbc_t *sbc)
 {
        uint8_t subbands, blocks;
        uint16_t frequency;
@@ -1157,7 +1214,10 @@ unsigned 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;
@@ -1186,7 +1246,7 @@ unsigned sbc_get_frame_duration(sbc_t *sbc)
        return (1000000 * blocks * subbands) / frequency;
 }
 
-size_t sbc_get_codesize(sbc_t *sbc)
+SBC_EXPORT size_t sbc_get_codesize(sbc_t *sbc)
 {
        uint16_t subbands, channels, blocks;
        struct sbc_priv *priv;
@@ -1194,7 +1254,10 @@ size_t sbc_get_codesize(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);
                channels = sbc->mode == SBC_MODE_MONO ? 1 : 2;
        } else {
                subbands = priv->frame.subbands;
@@ -1205,7 +1268,7 @@ size_t sbc_get_codesize(sbc_t *sbc)
        return subbands * blocks * channels * 2;
 }
 
-const char *sbc_get_implementation_info(sbc_t *sbc)
+SBC_EXPORT const char *sbc_get_implementation_info(sbc_t *sbc)
 {
        struct sbc_priv *priv;
 
@@ -1219,7 +1282,7 @@ const char *sbc_get_implementation_info(sbc_t *sbc)
        return priv->enc_state.implementation_info;
 }
 
-int sbc_reinit(sbc_t *sbc, unsigned long flags)
+SBC_EXPORT int sbc_reinit(sbc_t *sbc, unsigned long flags)
 {
        struct sbc_priv *priv;