Initial support for stereo codecs, and added L16 codecs. Also better handling for case remote media is restarted

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@411 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 39 insertions, 27 deletions

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 73c1e19a..9ab9a2bc 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -64,11 +64,12 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
 #
 export PJMEDIA_SRCDIR = ../src/pjmedia
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-			codec.o conference.o endpoint.o errno.o file_player.o \
-			file_writer.o \
-			g711.o jbuf.o null_port.o port.o resample.o resample_port.o \
-			rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
-			sound_port.o stream.o wave.o $(SOUND_OBJS) $(NULLSOUND_OBJS)
+			clock_thread.o codec.o conference.o endpoint.o errno.o \
+			wav_player.o wav_writer.o g711.o jbuf.o \
+			master_port.o null_port.o port.o resample.o \
+			resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \
+			session.o silencedet.o sound_port.o stream.o wave.o \
+			$(SOUND_OBJS) $(NULLSOUND_OBJS)
 
 export PJMEDIA_CFLAGS += $(_CFLAGS)
 
@@ -87,15 +88,18 @@ GSM_CFLAGS :=
 
 SPEEX_OBJS :=	speex_codec.o \
 		speex/bits.o speex/cb_search.o speex/exc_10_16_table.o  \
-		speex/exc_10_32_table.o speex/exc_20_32_table.o speex/exc_5_256_table.o \
-		speex/exc_5_64_table.o speex/exc_8_128_table.o speex/filters.o \
-		speex/gain_table.o speex/gain_table_lbr.o speex/hexc_10_32_table.o \
-		speex/hexc_table.o speex/high_lsp_tables.o speex/lpc_spx.o \
-		speex/lsp.o speex/lsp_tables_nb.o speex/ltp.o speex/math_approx.o \
-		speex/misc.o speex/modes.o speex/nb_celp.o speex/preprocess_spx.o \
-		speex/quant_lsp.o speex/sb_celp.o speex/smallft.o speex/speex.o \
-		speex/speex_callbacks.o speex/speex_header.o speex/stereo.o \
-		speex/vbr.o speex/vq.o
+		speex/exc_10_32_table.o speex/exc_20_32_table.o \
+		speex/exc_5_256_table.o speex/exc_5_64_table.o \
+		speex/exc_8_128_table.o speex/filters.o \
+		speex/gain_table.o speex/gain_table_lbr.o \
+		speex/hexc_10_32_table.o speex/hexc_table.o \
+		speex/high_lsp_tables.o speex/lpc_spx.o \
+		speex/lsp.o speex/lsp_tables_nb.o speex/ltp.o \
+		speex/math_approx.o speex/misc.o speex/modes.o \
+		speex/nb_celp.o speex/preprocess_spx.o \
+		speex/quant_lsp.o speex/sb_celp.o speex/smallft.o \
+		speex/speex.o speex/speex_callbacks.o speex/speex_header.o \
+		speex/stereo.o speex/vbr.o speex/vq.o
 SPEEX_CFLAGS := -DHAVE_CONFIG=1 -I../src/pjmedia-codec
 
 export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp
index 97a5fce5..aa29ff7e 100644
--- a/pjmedia/build/pjmedia.dsp
+++ b/pjmedia/build/pjmedia.dsp
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-debug"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c

+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "PA_NO_WMME" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -111,14 +111,6 @@ SOURCE=..\src\pjmedia\errno.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\pjmedia\file_player.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\file_writer.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\src\pjmedia\g711.c

 # End Source File

 # Begin Source File

@@ -191,6 +183,14 @@ SOURCE=..\src\pjmedia\stream.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\pjmedia\wav_player.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\pjmedia\wav_writer.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\pjmedia\wave.c

 # End Source File

 # End Group

@@ -227,10 +227,6 @@ SOURCE=..\include\pjmedia\errno.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\include\pjmedia\file_port.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\include\pjmedia\g711.h

 # End Source File

 # Begin Source File

@@ -299,6 +295,10 @@ SOURCE=..\include\pjmedia\types.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\include\pjmedia\wav_port.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\include\pjmedia\wave.h

 # End Source File

 # End Group

diff --git a/pjmedia/build/pjmedia_codec.dsp b/pjmedia/build/pjmedia_codec.dsp
index 0c762097..ec662794 100644
--- a/pjmedia/build/pjmedia_codec.dsp
+++ b/pjmedia/build/pjmedia_codec.dsp
@@ -91,6 +91,10 @@ SOURCE="..\src\pjmedia-codec\gsm.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\src\pjmedia-codec\l16.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\src\pjmedia-codec\speex_codec.c"
 # End Source File
 # End Group
@@ -107,6 +111,10 @@ SOURCE="..\include\pjmedia-codec\gsm.h"
 # End Source File
 # Begin Source File
 
+SOURCE="..\include\pjmedia-codec\l16.h"
+# End Source File
+# Begin Source File
+
 SOURCE="..\include\pjmedia-codec.h"
 # End Source File
 # Begin Source File