Revision

15278

Author

brian

Date

2009-10-29 16:58:57 -0500 (Thu, 29 Oct 2009)

Log Message

 bring CELT up to the latest build we need more testers 

Modified Paths

• freeswitch/trunk/src/mod/codecs/mod_celt/Makefile
• freeswitch/trunk/src/mod/codecs/mod_celt/mod_celt.c

Diff

--- freeswitch/trunk/src/mod/codecs/mod_celt/Makefile	2009-10-29 21:58:37 UTC (rev 15277)
+++ freeswitch/trunk/src/mod/codecs/mod_celt/Makefile	2009-10-29 21:58:57 UTC (rev 15278)
@@ -1,6 +1,6 @@
 BASE=../../../..
 
-CELT=celt-0.6.1
+CELT=celt-0.7.0
 
 CELT_DIR=$(BASE)/libs/$(CELT)
 LOCAL_CFLAGS=-I$(CELT_DIR)/libcelt

--- freeswitch/trunk/src/mod/codecs/mod_celt/mod_celt.c	2009-10-29 21:58:37 UTC (rev 15277)
+++ freeswitch/trunk/src/mod/codecs/mod_celt/mod_celt.c	2009-10-29 21:58:57 UTC (rev 15278)
@@ -53,7 +53,7 @@
 		return SWITCH_STATUS_FALSE;
 	} 
 
-	context->mode_object = celt_mode_create(codec->implementation->actual_samples_per_second, 1, codec->implementation->samples_per_packet, NULL); 
+	context->mode_object = celt_mode_create(codec->implementation->actual_samples_per_second, codec->implementation->samples_per_packet, NULL); 
 	celt_mode_info(context->mode_object, CELT_GET_FRAME_SIZE, &context->frame_size);
 	context->bytes_per_packet = (codec->implementation->bits_per_second * context->frame_size/codec->implementation->actual_samples_per_second + 4) / 8;
 
@@ -81,11 +81,11 @@
 	codec->fmtp_out = switch_core_sprintf(codec->memory_pool, "bitrate=%d", bit_rate);
 	*/
 	if (encoding) {
-		context->encoder_object = celt_encoder_create(context->mode_object);
+		context->encoder_object = celt_encoder_create(context->mode_object, 1, NULL);
 	}
 	
 	if (decoding) {
-		context->decoder_object = celt_decoder_create(context->mode_object);
+		context->decoder_object = celt_decoder_create(context->mode_object, 1, NULL);
 	}
 	
 	codec->private_info = context;
@@ -111,7 +111,7 @@
 		return SWITCH_STATUS_FALSE;
 	}
 
-	*encoded_data_len = (uint32_t) celt_encode(context->encoder_object, (celt_int16_t *)decoded_data, NULL,
+	*encoded_data_len = (uint32_t) celt_encode(context->encoder_object, (void *)decoded_data, NULL,
 											   (unsigned char *)encoded_data, context->bytes_per_packet);
 
 	return SWITCH_STATUS_SUCCESS;