Changeset 4152:3e89cc389e23 in roaraudio for libroardsp

Timestamp:

08/12/10 22:02:40 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed for use with libcelt = 0.7.1

File:

• libroardsp/transcode_celt.c (modified) (4 diffs)

libroardsp/transcode_celt.c

@@ -31 +31 @@
 #define _SIZE_LEN 2
 
+#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+typedef celt_int16 celt_int16_t;
+#endif
+
 int roar_xcoder_celt_init       (struct roar_xcoder * state) {
  struct roar_xcoder_celt * self = roar_mm_malloc(sizeof(struct roar_xcoder_celt));
@@ -58 +62 @@
  }
 
+#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+ self->mode                 = celt_mode_create(info->rate, self->frame_size, NULL);
+#else
  self->mode                 = celt_mode_create(info->rate, info->channels, self->frame_size, NULL);
+#endif
 
  if ( self->mode == NULL ) {
@@ -67 +75 @@
 
  if (state->encode) {
+#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+  self->encoder = celt_encoder_create(self->mode, info->channels, NULL);
+#else
   self->encoder = celt_encoder_create(self->mode);
+#endif
   if ( self->encoder == NULL ) {
    roar_xcoder_celt_uninit(state);
@@ -73 +85 @@
   }
  } else {
+#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+  self->decoder = celt_decoder_create(self->mode, info->channels, NULL);
+#else
   self->decoder = celt_decoder_create(self->mode);
+#endif
   if ( self->decoder == NULL ) {
    roar_xcoder_celt_uninit(state);