Changeset 3362 for pjproject/trunk

Timestamp:

Nov 3, 2010 7:33:07 AM (14 years ago)

Author:

bennylp

Message:

Misc (re #1151): fixed the compile time switch to use iLBC codec on iPhone

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ilbc.c (modified) (13 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ilbc.c

@@ -32 +32 @@
 #include <pj/os.h>
 
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     #include <AudioToolbox/AudioToolbox.h>
     #define iLBC_Enc_Inst_t AudioConverterRef
@@ -152 +152 @@
     float                dec_block[BLOCKL_MAX];
 
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     unsigned             enc_total_packets;
     char                 *enc_buffer;
@@ -372 +372 @@
     ilbc_codec = (struct ilbc_codec*) codec;
 
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     if (ilbc_codec->enc) {
         AudioConverterDispose(ilbc_codec->enc);
@@ -411 +411 @@
                 enc_fmtp_mode = DEFAULT_MODE;
 
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     AudioStreamBasicDescription srcFormat, dstFormat;
     UInt32 size;
@@ -480 +480 @@
 
     /* Create encoder */
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     dstFormat.mFramesPerPacket  = CLOCK_RATE * enc_fmtp_mode / 1000;
     dstFormat.mBytesPerPacket   = (enc_fmtp_mode == 20? 38 : 50);
@@ -499 +499 @@
 
     /* Create decoder */
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     if (AudioConverterNew(&dstFormat, &srcFormat, &ilbc_codec->dec) != noErr)
         return PJMEDIA_CODEC_EFAILED;
@@ -595 +595 @@
 }
 
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
 static OSStatus encodeDataProc (
     AudioConverterRef             inAudioConverter,
@@ -669 +669 @@
     pj_int16_t *pcm_in;
     unsigned nsamples;
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     UInt32 npackets;
     OSStatus err;
@@ -714 +714 @@
     /* Encode */
     output->size = 0;
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     npackets = nsamples / ilbc_codec->enc_samples_per_frame;
 
@@ -765 +765 @@
 {
     struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     UInt32 npackets;
     OSStatus err;
@@ -783 +783 @@
 
     /* Decode to temporary buffer */
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     npackets = input->size / ilbc_codec->dec_frame_size *
                ilbc_codec->dec_samples_per_frame;
@@ -828 +828 @@
 {
     struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     UInt32 npackets;
     OSStatus err;
@@ -843 +843 @@
 
     /* Decode to temporary buffer */
-#ifdef PJMEDIA_ILBC_CODEC_USE_COREAUDIO
+#if defined(PJMEDIA_ILBC_CODEC_USE_COREAUDIO)&& PJMEDIA_ILBC_CODEC_USE_COREAUDIO
     npackets = 1;