Changeset 2101

Timestamp:

Jul 4, 2008 4:45:17 PM (16 years ago)

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjmedia

Files:

• build/Makefile (modified) (4 diffs)
• build/pjmedia.dsp (modified) (2 diffs)
• build/pjmedia_test.dsp (modified) (3 diffs)
• include/pjmedia.h (modified) (4 diffs)
• include/pjmedia/transport_loop.h (added)
• src/pjmedia/transport_loop.c (added)
• src/test/main.c (modified) (1 diff, 1 prop)
• src/test/mips_test.c (added)
• src/test/test.c (modified) (1 diff)
• src/test/test.h (modified) (1 diff)

pjproject/trunk/pjmedia/build/Makefile

@@ -35 +35 @@
                    $(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) 
@@ -55 +58 @@
                         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)
@@ -90 +93 @@
 #
 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)
@@ -102 +106 @@
 # $(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)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -258 +258 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\transport_loop.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\transport_srtp.c
 # End Source File
@@ -435 +439 @@
 
 SOURCE=..\include\pjmedia\transport_ice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\transport_loop.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/build/pjmedia_test.dsp

@@ -43 +43 @@
 # 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"
@@ -96 +96 @@
 # Begin Source File
 
+SOURCE=..\src\test\mips_test.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\test\rtp_test.c
 # End Source File
@@ -105 +109 @@
 
 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

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -28 +28 @@
 #include <pjmedia/alaw_ulaw.h>
 #include <pjmedia/bidirectional.h>
+#include <pjmedia/circbuf.h>
 #include <pjmedia/clock.h>
 #include <pjmedia/codec.h>
 #include <pjmedia/conference.h>
+#include <pjmedia/delaybuf.h>
 #include <pjmedia/echo.h>
 #include <pjmedia/echo_port.h>
@@ -44 +46 @@
 #include <pjmedia/resample.h>
 #include <pjmedia/rtcp.h>
+#include <pjmedia/rtcp_xr.h>
 #include <pjmedia/rtp.h>
 #include <pjmedia/sdp.h>
@@ -53 +56 @@
 #include <pjmedia/splitcomb.h>
 #include <pjmedia/stereo.h>
+#include <pjmedia/stream.h>
 #include <pjmedia/tonegen.h>
 #include <pjmedia/transport.h>
 #include <pjmedia/transport_ice.h>
+#include <pjmedia/transport_loop.h>
 #include <pjmedia/transport_srtp.h>
 #include <pjmedia/transport_udp.h>
@@ -61 +66 @@
 #include <pjmedia/wav_port.h>
 #include <pjmedia/wave.h>
+#include <pjmedia/wsola.h>
 
 #endif  /* __PJMEDIA_H__ */

pjproject/trunk/pjmedia/src/test/main.c

@@ -1 @@
-/* $Id$ */
+/* $Id:$ */
 /* 
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>

pjproject/trunk/pjmedia/src/test/test.c

@@ -52 +52 @@
 
     pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
+    pj_log_set_level(3);
 
     mem = &caching_pool.factory;
 
-    sdp_neg_test();
+    //sdp_neg_test();
     //sdp_test (&caching_pool.factory);
     //rtp_test(&caching_pool.factory);
     //session_test (&caching_pool.factory);
     //jbuf_main();
+    mips_test();
 
     PJ_LOG(3,(THIS_FILE," "));

pjproject/trunk/pjmedia/src/test/test.h

@@ -29 +29 @@
 int jbuf_main(void);
 int sdp_neg_test(void);
+int mips_test(void);
 
 extern pj_pool_factory *mem;