Update gstreamer plugin to use new sbc API.

1 files changed, 20 insertions, 15 deletions

diff --git a/audio/gstsbcutil.h b/audio/gstsbcutil.h
index c0e876fd..a3cf937c 100644
--- a/audio/gstsbcutil.h
+++ b/audio/gstsbcutil.h
@@ -24,7 +24,10 @@
 #include <gst/gst.h>
 
 #include "sbc.h"
-#include "ipc.h"
+#include <string.h>
+
+#define SBC_AM_AUTO 0x02
+#define SBC_MODE_AUTO 0x04
 
 gint gst_sbc_select_rate_from_list(const GValue *value);
 
@@ -39,15 +42,25 @@ gint gst_sbc_select_bitpool_from_range(const GValue *value);
 gint gst_sbc_select_bitpool_from_range(const GValue *value);
 
 const gchar *gst_sbc_get_allocation_from_list(const GValue *value);
-gint gst_sbc_get_allocation_mode_int(const gchar *allocation);
-const gchar *gst_sbc_get_allocation_string(int alloc);
 
 const gchar *gst_sbc_get_mode_from_list(const GValue *value, gint channels);
-gint gst_sbc_get_mode_int(const gchar *mode);
-gint gst_sbc_get_mode_int_from_sbc_t(const sbc_t *sbc);
-const gchar *gst_sbc_get_mode_string(int joint);
 
-GstCaps* gst_sbc_caps_from_sbc(sbc_capabilities_t *sbc, gint channels);
+gint gst_sbc_get_channel_number(gint mode);
+gint gst_sbc_parse_rate_from_sbc(gint frequency);
+gint gst_sbc_parse_rate_to_sbc(gint rate);
+
+gint gst_sbc_parse_subbands_from_sbc(gint subbands);
+gint gst_sbc_parse_subbands_to_sbc(gint subbands);
+
+gint gst_sbc_parse_blocks_from_sbc(gint blocks);
+gint gst_sbc_parse_blocks_to_sbc(gint blocks);
+
+const gchar *gst_sbc_parse_mode_from_sbc(gint mode);
+gint gst_sbc_parse_mode_to_sbc(const gchar *mode);
+
+const gchar *gst_sbc_parse_allocation_from_sbc(gint alloc);
+gint gst_sbc_parse_allocation_to_sbc(const gchar *allocation);
+
 GstCaps* gst_sbc_parse_caps_from_sbc(sbc_t *sbc);
 
 GstCaps* gst_sbc_util_caps_fixate(GstCaps *caps, gchar** error_message);
@@ -62,11 +75,3 @@ void gst_sbc_util_set_structure_string_param(GstStructure *structure,
 
 gboolean gst_sbc_util_fill_sbc_params(sbc_t *sbc, GstCaps *caps);
 
-gint gst_sbc_util_calc_frame_len(gint subbands, gint channels,
-                gint blocks, gint bitpool, gint channel_mode);
-
-gint gst_sbc_util_calc_bitrate(gint frame_len, gint rate, gint subbands,
-		gint blocks);
-
-gint64 gst_sbc_util_calc_frame_duration(gint rate, gint blocks, gint subbands);
-