Added MIPS benchmark in pjmedia-test, and loopback media transport to assist the stream testing

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

3 files changed, 21 insertions, 22 deletions

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 1af0e76f..f29eaede 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -34,9 +34,12 @@ export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
 		   $(HOST_CXXFLAGS) $(CXXFLAGS)
 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
+		   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \
+		   -L$(PJDIR)/third_party/lib \
+		   $(APP_THIRD_PARTY_LIBS) \
 		   $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
 		   $(LDFLAGS) 
 
@@ -54,8 +57,8 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 			resample_port.o rtcp.o rtcp_xr.o rtp.o \
 			sdp.o sdp_cmp.o sdp_neg.o \
 			session.o silencedet.o sound_port.o stereo_port.o \
-			stream.o tonegen.o transport_ice.o transport_srtp.o \
-			transport_udp.o \
+			stream.o tonegen.o transport_ice.o transport_loop.o \
+			transport_srtp.o transport_udp.o \
 			wav_player.o wav_playlist.o wav_writer.o wave.o \
 			wsola.o $(SOUND_OBJS) $(NULLSOUND_OBJS)
 
@@ -89,7 +92,8 @@ export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
 # Defines for building test application
 #
 export PJMEDIA_TEST_SRCDIR = ../src/test
-export PJMEDIA_TEST_OBJS += jbuf_test.o main.o rtp_test.o sdp_neg_test.o test.o
+export PJMEDIA_TEST_OBJS += jbuf_test.o main.o mips_test.o rtp_test.o test.o
+#export PJMEDIA_TEST_OBJS += sdp_neg_test.o 
 export PJMEDIA_TEST_CFLAGS += $(_CFLAGS)
 export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS)
 export PJMEDIA_TEST_EXE:=../bin/pjmedia-test-$(TARGET_NAME)$(HOST_EXE)
@@ -101,8 +105,7 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
 #
 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
 #
-TARGETS := pjmedia pjmedia-codec pjsdp
-#pjmedia-test
+TARGETS := pjmedia pjmedia-codec pjsdp pjmedia-test
 
 all: $(TARGETS)
 
diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp
index 9d3ab3f2..f0ce7c3e 100644
--- a/pjmedia/build/pjmedia.dsp
+++ b/pjmedia/build/pjmedia.dsp
@@ -257,6 +257,10 @@ SOURCE=..\src\pjmedia\transport_ice.c
 # End Source File

 # Begin Source File

 

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

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\pjmedia\transport_srtp.c

 # End Source File

 # Begin Source File

@@ -437,6 +441,10 @@ SOURCE=..\include\pjmedia\transport_ice.h
 # End Source File

 # Begin Source File

 

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

+# End Source File

+# Begin Source File

+

 SOURCE=..\include\pjmedia\transport_srtp.h

 # End Source File

 # Begin Source File

diff --git a/pjmedia/build/pjmedia_test.dsp b/pjmedia/build/pjmedia_test.dsp
index 48cfb977..786483fb 100644
--- a/pjmedia/build/pjmedia_test.dsp
+++ b/pjmedia/build/pjmedia_test.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../pjlib/include" /I "../include" /I "../../pjnath/include" /I "../../pjlib-util/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../pjlib/include" /I "../include" /I "../../pjnath/include" /I "../../pjlib-util/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -95,6 +95,10 @@ SOURCE=..\src\test\main.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\test\mips_test.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\test\rtp_test.c

 # End Source File

 # Begin Source File

@@ -104,28 +108,12 @@ SOURCE=..\src\test\sdp_neg_test.c
 # Begin Source File

 

 SOURCE=..\src\test\sdptest.c

-

-!IF  "$(CFG)" == "pjmedia_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "pjmedia_test - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File

 

 SOURCE=..\src\test\session_test.c

-

-!IF  "$(CFG)" == "pjmedia_test - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "pjmedia_test - Win32 Debug"

-

 # PROP Exclude_From_Build 1

-

-!ENDIF 

-

 # End Source File

 # Begin Source File