Changeset 341

Timestamp:

Mar 20, 2006 4:58:43 PM (19 years ago)

Author:

bennylp

Message:

Ported PJMEDIA to Darwin/MacOSX

Location:

pjproject/trunk

Files:

• build/os-darwinos.mak (modified) (1 diff)
• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/build/os-darwinos.mak (added)
• pjmedia/build/os-linux.mak (modified) (1 diff)
• pjmedia/include/pjmedia/wave.h (modified) (2 diffs)
• pjmedia/src/pjmedia/file_port.c (modified) (4 diffs)
• pjmedia/src/pjmedia/portaudio/pa_lib.c (modified) (1 diff)
• pjmedia/src/pjmedia/portaudio/pa_mac_core.c (modified) (6 diffs)

pjproject/trunk/build/os-darwinos.mak

@@ -3 +3 @@
 export OS_CXXFLAGS := 
 
-export OS_LDFLAGS  := $(CC_LIB)pthread$(LIBEXT2) 
+export OS_LDFLAGS  := $(CC_LIB)pthread$(LIBEXT2) -framework CoreAudio
 
 export OS_SOURCES  := 

pjproject/trunk/pjmedia/build/Makefile

@@ -66 +66 @@
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
                         codec.o conference.o endpoint.o errno.o file_port.o \
-                        g711.o jbuf.o null_port.o pasound.o port.o resample.o rtcp.o \
+                        g711.o jbuf.o null_port.o port.o resample.o rtcp.o \
                         rtp.o sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
                         sound_port.o stream.o $(SOUND_OBJS) $(NULLSOUND_OBJS)

pjproject/trunk/pjmedia/build/os-linux.mak

@@ -1 +1 @@
 #
-# OS specific configuration for Win32 OS target. 
+# OS specific configuration for Linux OS target. 
 #
 

pjproject/trunk/pjmedia/include/pjmedia/wave.h

@@ -30 +30 @@
 PJ_BEGIN_DECL
 
-#if PJ_IS_BIG_ENDIAN
-#   define PJMEDIA_RIFF_TAG     ('R'<<24|'I'<<16|'F'<<8|'F')
-#   define PJMEDIA_WAVE_TAG     ('W'<<24|'A'<<16|'V'<<8|'E')
-#   define PJMEDIA_FMT_TAG      ('f'<<24|'m'<<16|'t'<<8|' ')
-#else
-#   define PJMEDIA_RIFF_TAG     ('F'<<24|'F'<<16|'I'<<8|'R')
-#   define PJMEDIA_WAVE_TAG     ('E'<<24|'V'<<16|'A'<<8|'W')
-#   define PJMEDIA_FMT_TAG      (' '<<24|'t'<<16|'m'<<8|'f')
-#endif
+#define PJMEDIA_RIFF_TAG        ('F'<<24|'F'<<16|'I'<<8|'R')
+#define PJMEDIA_WAVE_TAG        ('E'<<24|'V'<<16|'A'<<8|'W')
+#define PJMEDIA_FMT_TAG         (' '<<24|'t'<<16|'m'<<8|'f')
 
 
@@ -79 +73 @@
 
 #endif  /* __PJMEDIA_WAVE_H__ */
+

pjproject/trunk/pjmedia/src/pjmedia/file_port.c

@@ -38 +38 @@
 #define SIGNATURE       ('F'<<24|'I'<<16|'L'<<8|'E')
 
+#if 1
+#   define TRACE_(x)    PJ_LOG(4,x)
+#else
+#   define TRACE_(x)
+#endif
+
+#if defined(PJ_IS_BIG_ENDIAN) && PJ_IS_BIG_ENDIAN!=0
+    PJ_INLINE(pj_int16_t) swap16(pj_int16_t val)
+    {
+        pj_uint8_t *p = (pj_uint8_t*)&val;
+        pj_uint8_t tmp = *p;
+        *p = *(p+1);
+        *(p+1) = tmp;
+        return val;
+    }
+    PJ_INLINE(pj_int32_t) swap32(pj_int32_t val)
+    {
+        pj_uint8_t *p = (pj_uint8_t*)&val;
+        pj_uint8_t tmp = *p;
+        *p = *(p+3);
+        *(p+3) = tmp;
+        tmp = *(p+1);
+        *(p+1) = *(p+2);
+        *(p+2) = tmp;
+        return val;
+    }
+#   define SWAP16(val16)        swap16(val16)
+#   define SWAP32(val32)        swap32(val32)
+    static void samples_to_host(pj_int16_t *samples, unsigned count)
+    {
+        unsigned i;
+        for (i=0; i<count; ++i) {
+            samples[i] = SWAP16(samples[i]);
+        }
+    }
+#else
+#   define SWAP16(val16)        (val16)
+#   define SWAP32(val32)        (val32)
+#   define samples_to_host(samples,count)
+#endif
+
 struct file_port
 {
@@ -129 +170 @@
     }
 
+    /* Convert samples to host rep */
+    samples_to_host((pj_int16_t*)fport->buf, fport->bufsize/2);
+
     return PJ_SUCCESS;
 }
+
+
+/*
+ * Change the endianness of WAVE header fields.
+ */
+void pjmedia_wave_hdr_swap_bytes( pjmedia_wave_hdr *hdr )
+{
+    hdr->riff_hdr.riff              = SWAP32(hdr->riff_hdr.riff);
+    hdr->riff_hdr.file_len          = SWAP32(hdr->riff_hdr.file_len);
+    hdr->riff_hdr.wave              = SWAP32(hdr->riff_hdr.wave);
+    
+    hdr->fmt_hdr.fmt                = SWAP32(hdr->fmt_hdr.fmt);
+    hdr->fmt_hdr.len                = SWAP32(hdr->fmt_hdr.len);
+    hdr->fmt_hdr.fmt_tag            = SWAP16(hdr->fmt_hdr.fmt_tag);
+    hdr->fmt_hdr.nchan              = SWAP16(hdr->fmt_hdr.nchan);
+    hdr->fmt_hdr.sample_rate        = SWAP32(hdr->fmt_hdr.sample_rate);
+    hdr->fmt_hdr.bytes_per_sec      = SWAP32(hdr->fmt_hdr.bytes_per_sec);
+    hdr->fmt_hdr.block_align        = SWAP16(hdr->fmt_hdr.block_align);
+    hdr->fmt_hdr.bits_per_sample    = SWAP16(hdr->fmt_hdr.bits_per_sample);
+    
+    hdr->data_hdr.data              = SWAP32(hdr->data_hdr.data);
+    hdr->data_hdr.len               = SWAP32(hdr->data_hdr.len);
+}
+
+
+#if defined(PJ_IS_BIG_ENDIAN) && PJ_IS_BIG_ENDIAN!=0
+#   define normalize_wave_hdr(hdr)  pjmedia_wave_hdr_swap_bytes(hdr)
+#endif
+
 
 /*
@@ -191 +264 @@
     }
 
+    /* Normalize WAVE header fields value (only used in big-endian hosts) */
+    normalize_wave_hdr(&wave_hdr);
+    
     /* Validate WAVE file. */
     if (wave_hdr.riff_hdr.riff != PJMEDIA_RIFF_TAG ||
@@ -197 +273 @@
     {
         pj_file_close(fport->fd);
+        TRACE_((THIS_FILE, 
+                "actual value|expected riff=%x|%x, wave=%x|%x fmt=%x|%x",
+                wave_hdr.riff_hdr.riff, PJMEDIA_RIFF_TAG,
+                wave_hdr.riff_hdr.wave, PJMEDIA_WAVE_TAG,
+                wave_hdr.fmt_hdr.fmt, PJMEDIA_FMT_TAG));
         return PJMEDIA_ENOTVALIDWAVE;
     }

pjproject/trunk/pjmedia/src/pjmedia/portaudio/pa_lib.c

@@ -50 +50 @@
 
 #include "portaudio.h"
-#include "pa_host.h"
+//#include "pa_host.h"
 #include "pa_trace.h"
+
+typedef PaDeviceIndex PaDeviceID;
+typedef PaStream      PortAudioStream;
+#define DLL_API
 
 /* The reason we might NOT want to validate the rate before opening the stream

pjproject/trunk/pjmedia/src/pjmedia/portaudio/pa_mac_core.c

@@ -149 +149 @@
         case kAudioHardwareBadStreamError:
             result = paBadStreamPtr; break;
-        case kAudioHardwareUnsupportedOperationError:
-            result = paInternalError; break;
+//        case kAudioHardwareUnsupportedOperationError:
+//            result = paInternalError; break;
         case kAudioDeviceUnsupportedFormatError:
             result = paSampleFormatNotSupported; break;
@@ -411 +411 @@
         portAudioBuffer += Pa_GetSampleSize(destination->inputSampleFormat) * channelSpacing;
     }
+    return 0;
 }
 
@@ -440 +441 @@
         portAudioBuffer += Pa_GetSampleSize(source->outputSampleFormat) * channelSpacing;
     }    
+    return 0;
 }
 
@@ -471 +473 @@
         Pa_StopStream(clientData->stream);
     }
+    return 0;
 }
 
@@ -495 +498 @@
     
     PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
+    return 0;
 }
 
@@ -519 +523 @@
 
     PaUtil_EndCpuLoadMeasurement( &clientData->stream->cpuLoadMeasurer, frameCount );
+    return 0;
 }