Changeset 2101


Ignore:
Timestamp:
Jul 4, 2008 4:45:17 PM (11 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:
3 added
7 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/build/Makefile

    r2037 r2101  
    3535                   $(HOST_CXXFLAGS) $(CXXFLAGS) 
    3636export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ 
     37                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ 
    3738                   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ 
    3839                   $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ 
    3940                   $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ 
     41                   -L$(PJDIR)/third_party/lib \ 
     42                   $(APP_THIRD_PARTY_LIBS) \ 
    4043                   $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 
    4144                   $(LDFLAGS)  
     
    5558                        sdp.o sdp_cmp.o sdp_neg.o \ 
    5659                        session.o silencedet.o sound_port.o stereo_port.o \ 
    57                         stream.o tonegen.o transport_ice.o transport_srtp.o \ 
    58                         transport_udp.o \ 
     60                        stream.o tonegen.o transport_ice.o transport_loop.o \ 
     61                        transport_srtp.o transport_udp.o \ 
    5962                        wav_player.o wav_playlist.o wav_writer.o wave.o \ 
    6063                        wsola.o $(SOUND_OBJS) $(NULLSOUND_OBJS) 
     
    9093# 
    9194export PJMEDIA_TEST_SRCDIR = ../src/test 
    92 export PJMEDIA_TEST_OBJS += jbuf_test.o main.o rtp_test.o sdp_neg_test.o test.o 
     95export PJMEDIA_TEST_OBJS += jbuf_test.o main.o mips_test.o rtp_test.o test.o 
     96#export PJMEDIA_TEST_OBJS += sdp_neg_test.o  
    9397export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) 
    9498export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS) 
     
    102106# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 
    103107# 
    104 TARGETS := pjmedia pjmedia-codec pjsdp 
    105 #pjmedia-test 
     108TARGETS := pjmedia pjmedia-codec pjsdp pjmedia-test 
    106109 
    107110all: $(TARGETS) 
  • pjproject/trunk/pjmedia/build/pjmedia.dsp

    r2098 r2101  
    258258# Begin Source File 
    259259 
     260SOURCE=..\src\pjmedia\transport_loop.c 
     261# End Source File 
     262# Begin Source File 
     263 
    260264SOURCE=..\src\pjmedia\transport_srtp.c 
    261265# End Source File 
     
    435439 
    436440SOURCE=..\include\pjmedia\transport_ice.h 
     441# End Source File 
     442# Begin Source File 
     443 
     444SOURCE=..\include\pjmedia\transport_loop.h 
    437445# End Source File 
    438446# Begin Source File 
  • pjproject/trunk/pjmedia/build/pjmedia_test.dsp

    r1895 r2101  
    4343# PROP Target_Dir "" 
    4444# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 
    45 # 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 
     45# 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 
    4646# ADD BASE RSC /l 0x409 /d "NDEBUG" 
    4747# ADD RSC /l 0x409 /d "NDEBUG" 
     
    9696# Begin Source File 
    9797 
     98SOURCE=..\src\test\mips_test.c 
     99# End Source File 
     100# Begin Source File 
     101 
    98102SOURCE=..\src\test\rtp_test.c 
    99103# End Source File 
     
    105109 
    106110SOURCE=..\src\test\sdptest.c 
    107  
    108 !IF  "$(CFG)" == "pjmedia_test - Win32 Release" 
    109  
    110 !ELSEIF  "$(CFG)" == "pjmedia_test - Win32 Debug" 
    111  
    112111# PROP Exclude_From_Build 1 
    113  
    114 !ENDIF  
    115  
    116112# End Source File 
    117113# Begin Source File 
    118114 
    119115SOURCE=..\src\test\session_test.c 
    120  
    121 !IF  "$(CFG)" == "pjmedia_test - Win32 Release" 
    122  
    123 !ELSEIF  "$(CFG)" == "pjmedia_test - Win32 Debug" 
    124  
    125116# PROP Exclude_From_Build 1 
    126  
    127 !ENDIF  
    128  
    129117# End Source File 
    130118# Begin Source File 
  • pjproject/trunk/pjmedia/include/pjmedia.h

    r2039 r2101  
    2828#include <pjmedia/alaw_ulaw.h> 
    2929#include <pjmedia/bidirectional.h> 
     30#include <pjmedia/circbuf.h> 
    3031#include <pjmedia/clock.h> 
    3132#include <pjmedia/codec.h> 
    3233#include <pjmedia/conference.h> 
     34#include <pjmedia/delaybuf.h> 
    3335#include <pjmedia/echo.h> 
    3436#include <pjmedia/echo_port.h> 
     
    4446#include <pjmedia/resample.h> 
    4547#include <pjmedia/rtcp.h> 
     48#include <pjmedia/rtcp_xr.h> 
    4649#include <pjmedia/rtp.h> 
    4750#include <pjmedia/sdp.h> 
     
    5356#include <pjmedia/splitcomb.h> 
    5457#include <pjmedia/stereo.h> 
     58#include <pjmedia/stream.h> 
    5559#include <pjmedia/tonegen.h> 
    5660#include <pjmedia/transport.h> 
    5761#include <pjmedia/transport_ice.h> 
     62#include <pjmedia/transport_loop.h> 
    5863#include <pjmedia/transport_srtp.h> 
    5964#include <pjmedia/transport_udp.h> 
     
    6166#include <pjmedia/wav_port.h> 
    6267#include <pjmedia/wave.h> 
     68#include <pjmedia/wsola.h> 
    6369 
    6470#endif  /* __PJMEDIA_H__ */ 
  • pjproject/trunk/pjmedia/src/test/main.c

    • Property svn:keywords changed from "Id Revision" to id
    r2039 r2101  
    1 /* $Id$ */ 
     1/* $Id:$ */ 
    22/*  
    33 * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> 
  • pjproject/trunk/pjmedia/src/test/test.c

    r2039 r2101  
    5252 
    5353    pj_log_set_decor(PJ_LOG_HAS_NEWLINE); 
     54    pj_log_set_level(3); 
    5455 
    5556    mem = &caching_pool.factory; 
    5657 
    57     sdp_neg_test(); 
     58    //sdp_neg_test(); 
    5859    //sdp_test (&caching_pool.factory); 
    5960    //rtp_test(&caching_pool.factory); 
    6061    //session_test (&caching_pool.factory); 
    6162    //jbuf_main(); 
     63    mips_test(); 
    6264 
    6365    PJ_LOG(3,(THIS_FILE," ")); 
  • pjproject/trunk/pjmedia/src/test/test.h

    r2039 r2101  
    2929int jbuf_main(void); 
    3030int sdp_neg_test(void); 
     31int mips_test(void); 
    3132 
    3233extern pj_pool_factory *mem; 
Note: See TracChangeset for help on using the changeset viewer.