sbc: Rename sbc_analyze_4b_xx to sbc_analyze_xx

[android-x86/external-bluetooth-sbc.git] / sbc / sbc.c

diff --git a/sbc/sbc.c b/sbc/sbc.c
index 89a6243..ffdf05d 100644 (file)
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -688,30 +688,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;
@@ -906,6 +908,7 @@ static void sbc_encoder_init(struct sbc_encoder_state *state,
 {
        memset(&state->X, 0, sizeof(state->X));
        state->position = (SBC_X_BUFFER_SIZE - frame->subbands * 9) & ~7;
+       state->increment = 4;
 
        sbc_init_primitives(state);
 }
@@ -933,7 +936,7 @@ static void sbc_set_defaults(sbc_t *sbc, unsigned long flags)
 #endif
 }
 
-LIB_EXPORT int sbc_init(sbc_t *sbc, unsigned long flags)
+SBC_EXPORT int sbc_init(sbc_t *sbc, unsigned long flags)
 {
        if (!sbc)
                return -EIO;
@@ -954,12 +957,12 @@ LIB_EXPORT int sbc_init(sbc_t *sbc, unsigned long flags)
        return 0;
 }
 
-LIB_EXPORT ssize_t sbc_parse(sbc_t *sbc, const void *input, size_t input_len)
+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);
 }
 
-LIB_EXPORT 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;
@@ -1028,7 +1031,7 @@ LIB_EXPORT ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len,
        return framelen;
 }
 
-LIB_EXPORT 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;
@@ -1117,7 +1120,7 @@ LIB_EXPORT ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len,
        return samples * priv->frame.channels * 2;
 }
 
-LIB_EXPORT void sbc_finish(sbc_t *sbc)
+SBC_EXPORT void sbc_finish(sbc_t *sbc)
 {
        if (!sbc)
                return;
@@ -1127,7 +1130,7 @@ LIB_EXPORT void sbc_finish(sbc_t *sbc)
        memset(sbc, 0, sizeof(sbc_t));
 }
 
-LIB_EXPORT 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;
@@ -1153,7 +1156,7 @@ LIB_EXPORT size_t sbc_get_frame_length(sbc_t *sbc)
        return ret;
 }
 
-LIB_EXPORT 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;
@@ -1191,7 +1194,7 @@ LIB_EXPORT unsigned sbc_get_frame_duration(sbc_t *sbc)
        return (1000000 * blocks * subbands) / frequency;
 }
 
-LIB_EXPORT 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;
@@ -1210,7 +1213,7 @@ LIB_EXPORT size_t sbc_get_codesize(sbc_t *sbc)
        return subbands * blocks * channels * 2;
 }
 
-LIB_EXPORT const char *sbc_get_implementation_info(sbc_t *sbc)
+SBC_EXPORT const char *sbc_get_implementation_info(sbc_t *sbc)
 {
        struct sbc_priv *priv;
 
@@ -1224,7 +1227,7 @@ LIB_EXPORT const char *sbc_get_implementation_info(sbc_t *sbc)
        return priv->enc_state.implementation_info;
 }
 
-LIB_EXPORT int sbc_reinit(sbc_t *sbc, unsigned long flags)
+SBC_EXPORT int sbc_reinit(sbc_t *sbc, unsigned long flags)
 {
        struct sbc_priv *priv;