From cd283c8825c9a94400f27735acb1c9385e90ffc8 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 19 Jul 2011 03:42:28 +0000 Subject: Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn". git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/build/Makefile | 48 +- pjmedia/build/os-auto.mak.in | 53 +- pjmedia/build/pjaut.dsp | 102 -- pjmedia/build/pjmedia.dsp | 488 ------ pjmedia/build/pjmedia.dsw | 140 -- pjmedia/build/pjmedia.vcproj | 647 ++++---- pjmedia/build/pjmedia_audiodev.dsp | 154 -- pjmedia/build/pjmedia_codec.dsp | 223 --- pjmedia/build/pjmedia_codec.vcproj | 24 + pjmedia/build/pjmedia_test.dsp | 144 -- pjmedia/build/pjmedia_test.vcproj | 724 ++++----- pjmedia/build/pjmedia_videodev.vcproj | 2856 +++++++++++++++++++++++++++++++++ 12 files changed, 3598 insertions(+), 2005 deletions(-) delete mode 100644 pjmedia/build/pjaut.dsp delete mode 100644 pjmedia/build/pjmedia.dsp delete mode 100644 pjmedia/build/pjmedia.dsw delete mode 100644 pjmedia/build/pjmedia_audiodev.dsp delete mode 100644 pjmedia/build/pjmedia_codec.dsp delete mode 100644 pjmedia/build/pjmedia_test.dsp create mode 100644 pjmedia/build/pjmedia_videodev.vcproj (limited to 'pjmedia/build') diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index b0e2014d..902a9630 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -18,6 +18,7 @@ export PJMEDIA_LIB:=../lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT) export PJMEDIA_AUDIODEV_LIB:=../lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) +export PJMEDIA_VIDEODEV_LIB:=../lib/libpjmedia-videodev-$(TARGET_NAME)$(LIBEXT) ############################################################################### @@ -27,14 +28,16 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(CFLAGS) $(CC_INC)../include \ $(CC_INC)../../pjlib/include \ $(CC_INC)../../pjlib-util/include \ + $(CC_INC)../../pjmedia/include \ $(CC_INC)../../pjnath/include \ $(CC_INC)../.. \ $(SRTP_INC) export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) -export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \ +export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_VIDEODEV_LIB)) \ $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ + $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ + $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \ $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ @@ -49,18 +52,22 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ # export PJMEDIA_SRCDIR = ../src/pjmedia export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - alaw_ulaw.o alaw_ulaw_table.o bidirectional.o clock_thread.o codec.o \ - conference.o conf_switch.o delaybuf.o echo_common.o \ + alaw_ulaw.o alaw_ulaw_table.o avi_player.o \ + bidirectional.o clock_thread.o codec.o conference.o \ + conf_switch.o converter.o converter_libswscale.o \ + delaybuf.o echo_common.o \ echo_port.o echo_suppress.o endpoint.o errno.o \ + event.o format.o ffmpeg_util.o \ g711.o jbuf.o master_port.o mem_capture.o mem_player.o \ null_port.o plc_common.o port.o splitcomb.o \ resample_resample.o resample_libsamplerate.o \ resample_port.o rtcp.o rtcp_xr.o rtp.o \ sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \ sound_legacy.o sound_port.o stereo_port.o \ - stream.o tonegen.o transport_adapter_sample.o \ - transport_ice.o transport_loop.o \ - transport_srtp.o transport_udp.o \ + stream_common.o stream.o tonegen.o transport_adapter_sample.o \ + transport_ice.o transport_loop.o transport_srtp.o transport_udp.o \ + types.o vid_codec.o vid_codec_util.o \ + vid_port.o vid_stream.o vid_tee.o \ wav_player.o wav_playlist.o wav_writer.o wave.o \ wsola.o @@ -77,6 +84,15 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) +############################################################################### +# Defines for building PJMEDIA-VIDEODEV library +# +export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev +export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o ffmpeg_dev.o \ + colorbar_dev.o v4l2_dev.o +export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) + + ############################################################################### # Defines for building PJSDP library # Note that SDP functionality is already INCLUDED in PJMEDIA. @@ -93,7 +109,8 @@ export PJSDP_CFLAGS += $(_CFLAGS) # Defines for building PJMEDIA-Codec library # export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec -export PJMEDIA_CODEC_OBJS += \ +export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_codecs.o \ + h263_packetizer.o h264_packetizer.o \ $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ ipp_codecs.o $(CODEC_OBJS) export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ @@ -104,7 +121,9 @@ export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ # Defines for building test application # export PJMEDIA_TEST_SRCDIR = ../src/test -export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o rtp_test.o test.o +export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o \ + vid_codec_test.o vid_dev_test.o vid_port_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) @@ -117,7 +136,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-audiodev pjmedia-codec pjsdp pjmedia-test +TARGETS := pjmedia pjmedia-videodev pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test all: $(TARGETS) @@ -132,7 +151,7 @@ doc: dep: depend distclean: realclean -.PHONY: dep depend pjmedia pjmedia-codec pjmedia-audiodev pjmedia-test clean realclean distclean +.PHONY: dep depend pjmedia pjmedia-codec pjmedia-videodev pjmedia-audiodev pjmedia-test clean realclean distclean pjmedia: $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB) @@ -140,6 +159,9 @@ pjmedia: pjmedia-codec: $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB) +pjmedia-videodev: + $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB) + pjmedia-audiodev: $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB) @@ -166,18 +188,21 @@ pjmedia-test: $(PJMEDIA_LIB) clean: $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ + $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@ $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ realclean: $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-$(TARGET_NAME).depend),$(HOST_RMR)) + $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-videodev-$(TARGET_NAME).depend),$(HOST_RMR)) $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-audiodev-$(TARGET_NAME).depend),$(HOST_RMR)) $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-codec-$(TARGET_NAME).depend),$(HOST_RMR)) $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-test-$(TARGET_NAME).depend),$(HOST_RMR)) $(subst @@,$(subst /,$(HOST_PSEP),.pjsdp-$(TARGET_NAME).depend),$(HOST_RMR)) $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ + $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ @@ -185,6 +210,7 @@ realclean: depend: $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ + $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index a329f76c..044339e0 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -1,7 +1,35 @@ # @configure_input@ +# Define the desired video device backend +# Valid values are: +# - mac_os +# - iphone_os +AC_PJMEDIA_VIDEO = @ac_pjmedia_video@ + +# SDL flags +SDL_CFLAGS = @ac_sdl_cflags@ +SDL_LDFLAGS = @ac_sdl_ldflags@ + +# FFMPEG dlags +FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ +FFMPEG_LDFLAGS = @ac_ffmpeg_ldflags@ + +# Video4Linux2 +V4L2_CFLAGS = @ac_v4l2_cflags@ +V4L2_LDFLAGS = @ac_v4l2_ldflags@ + +# QT +AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@ +QT_CFLAGS = @ac_qt_cflags@ + +# iOS +IOS_CFLAGS = @ac_ios_cflags@ + # PJMEDIA features exclusion -export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ +export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \ + $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ + $(IOS_CFLAGS) +export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) # Define the desired sound device backend # Valid values are: @@ -118,4 +146,27 @@ ifeq ($(AC_PJMEDIA_SND),external) export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 endif +# +# QT video device +# +ifeq ($(AC_PJMEDIA_VIDEO_HAS_QT),yes) +export PJMEDIA_VIDEODEV_OBJS += qt_dev.o +endif + +# +# iOS video device +# +ifeq ($(AC_PJMEDIA_VIDEO),iphone_os) +export PJMEDIA_VIDEODEV_OBJS += ios_dev.o +endif +# +# Determine whether we should compile the obj-c version of a particular source code +# +ifeq ($(AC_PJMEDIA_VIDEO),$(filter $(AC_PJMEDIA_VIDEO),mac_os iphone_os)) +# Mac and iPhone OS specific, use obj-c +export PJMEDIA_VIDEODEV_OBJS += sdl_dev_m.o +else +# Other platforms, compile .c +export PJMEDIA_VIDEODEV_OBJS += sdl_dev.o +endif diff --git a/pjmedia/build/pjaut.dsp b/pjmedia/build/pjaut.dsp deleted file mode 100644 index 99145d35..00000000 --- a/pjmedia/build/pjaut.dsp +++ /dev/null @@ -1,102 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjaut" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=pjaut - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjaut.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjaut.mak" CFG="pjaut - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjaut - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pjaut - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjaut - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_release" -# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_release" -# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release" -# 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/src" /I "../src" /I "../../pjsdp/src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjaut_vc6.exe" - -!ELSEIF "$(CFG)" == "pjaut - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_debug" -# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_debug" -# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjaut_vc6d.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pjaut - Win32 Release" -# Name "pjaut - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\test\audio_tool.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp deleted file mode 100644 index aa127e77..00000000 --- a/pjmedia/build/pjmedia.dsp +++ /dev/null @@ -1,488 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjmedia" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjmedia - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjmedia.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjmedia.mak" CFG="pjmedia - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjmedia - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjmedia - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjmedia - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjmedia-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjmedia-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjmedia-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjmedia - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjmedia-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjmedia-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# 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 "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "_DEBUG" /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" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjmedia-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjmedia - Win32 Release" -# Name "pjmedia - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\pjmedia\alaw_ulaw.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\alaw_ulaw_table.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\bidirectional.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\clock_thread.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\codec.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\conf_switch.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\conference.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\delaybuf.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\echo_common.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\echo_internal.h -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\echo_port.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\echo_speex.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\echo_suppress.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\endpoint.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\errno.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\g711.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\jbuf.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\master_port.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\mem_capture.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\mem_player.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\null_port.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\plc_common.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\port.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\resample_libsamplerate.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\resample_port.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\resample_resample.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\resample_speex.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\rtcp.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\rtcp_xr.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\rtp.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\sdp.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\sdp_cmp.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\sdp_neg.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\session.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\silencedet.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\sound_legacy.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\sound_port.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\splitcomb.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\stereo_port.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\stream.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\tonegen.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\transport_adapter_sample.c -# End Source File -# Begin Source File - -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 - -SOURCE=..\src\pjmedia\transport_udp.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\wav_player.c -# End Source File -# Begin Source File - -SOURCE=..\src\pjmedia\wav_playlist.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 -# Begin Source File - -SOURCE=..\src\pjmedia\wsola.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\include\pjmedia\alaw_ulaw.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\audio_dev.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\bidirectional.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\circbuf.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\clock.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\codec.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\conference.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\delaybuf.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\doxygen.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\echo.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\echo_port.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\endpoint.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\errno.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\g711.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\jbuf.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\master_port.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\mem_port.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\null_port.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\plc.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\port.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\resample.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\rtcp.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\rtcp_xr.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\rtp.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\sdp.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\sdp_neg.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\session.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\silencedet.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\sound.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\sound_port.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\splitcomb.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\stereo.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\stream.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\tonegen.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\transport.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\transport_adapter_sample.h -# End Source File -# Begin Source File - -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 - -SOURCE=..\include\pjmedia\transport_udp.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\types.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjmedia\wav_playlist.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 -# Begin Source File - -SOURCE=..\include\pjmedia\wsola.h -# End Source File -# End Group -# End Target -# End Project diff --git a/pjmedia/build/pjmedia.dsw b/pjmedia/build/pjmedia.dsw deleted file mode 100644 index b7147b6d..00000000 --- a/pjmedia/build/pjmedia.dsw +++ /dev/null @@ -1,140 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libportaudio"="..\..\third_party\build\portaudio\libportaudio.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libsrtp"="..\..\third_party\build\srtp\libsrtp.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjaut"=".\pjaut.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency -}}} - -############################################################################### - -Project: "pjlib"="..\..\pjlib\build\pjlib.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjmedia"=".\pjmedia.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency -}}} - -############################################################################### - -Project: "pjmedia_codec"=".\pjmedia_codec.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjmedia_test"=".\pjmedia_test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsdp - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib_util - End Project Dependency - Begin Project Dependency - Project_Dep_Name libportaudio - End Project Dependency - Begin Project Dependency - Project_Dep_Name libsrtp - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/pjmedia/build/pjmedia.vcproj b/pjmedia/build/pjmedia.vcproj index 3b7c518e..eca4ed6e 100644 --- a/pjmedia/build/pjmedia.vcproj +++ b/pjmedia/build/pjmedia.vcproj @@ -11,16 +11,16 @@ Name="Win32" /> + + @@ -3110,6 +3115,14 @@ /> + + + + @@ -3462,6 +3475,18 @@ /> + + + + + + @@ -4290,64 +4315,6 @@ /> - - - - - - - - - - - - - - - - - - - - @@ -4588,6 +4555,10 @@ /> + + @@ -4720,6 +4691,30 @@ /> + + + + + + + + + + + + @@ -4965,6 +4960,14 @@ RelativePath="..\include\pjmedia\alaw_ulaw.h" > + + + + @@ -4989,6 +4992,10 @@ RelativePath="..\include\pjmedia\config.h" > + + @@ -5013,6 +5020,18 @@ RelativePath="..\include\pjmedia\errno.h" > + + + + + + @@ -5070,7 +5089,7 @@ > + + @@ -5129,6 +5152,26 @@ RelativePath="..\include\pjmedia\types.h" > + + + + + + + + + + diff --git a/pjmedia/build/pjmedia_audiodev.dsp b/pjmedia/build/pjmedia_audiodev.dsp deleted file mode 100644 index 0c2266fe..00000000 --- a/pjmedia/build/pjmedia_audiodev.dsp +++ /dev/null @@ -1,154 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjmedia_audiodev" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjmedia_audiodev - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjmedia_audiodev.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjmedia_audiodev.mak" CFG="pjmedia_audiodev - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjmedia_audiodev - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjmedia_audiodev - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjmedia_audiodev - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjmedia-audiodev-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjmedia_audiodev - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjmedia_audiodev-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjmedia_audiodev-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# 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 "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "_DEBUG" /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" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjmedia-audiodev-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjmedia_audiodev - Win32 Release" -# Name "pjmedia_audiodev - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\audiodev.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\audiotest.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\errno.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\legacy_dev.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\null_dev.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\pa_dev.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\symb_aps_dev.cpp" -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\symb_mda_dev.cpp" -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-audiodev\wmme_dev.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\include\pjmedia-audiodev\audiodev.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-audiodev\audiodev_imp.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-audiodev\audiotest.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-audiodev\config.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-audiodev\errno.h" -# End Source File -# End Group -# End Target -# End Project diff --git a/pjmedia/build/pjmedia_codec.dsp b/pjmedia/build/pjmedia_codec.dsp deleted file mode 100644 index 3f9eb75f..00000000 --- a/pjmedia/build/pjmedia_codec.dsp +++ /dev/null @@ -1,223 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjmedia_codec" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjmedia_codec - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjmedia_codec.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjmedia_codec.mak" CFG="pjmedia_codec - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjmedia_codec - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjmedia_codec - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjmedia_codec - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /I "../../third_party" /I "../../third_party/speex/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjmedia_codec - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# 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 /ZI /Od /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /I "../../third_party" /I "../../third_party/speex/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjmedia_codec - Win32 Release" -# Name "pjmedia_codec - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "g722 Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE="..\src\pjmedia-codec\g722\g722_dec.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\g722\g722_dec.h" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\g722\g722_enc.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\g722\g722_enc.h" -# End Source File -# End Group -# Begin Source File - -SOURCE="..\src\pjmedia-codec\g722.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\g7221.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\gsm.c" - -!IF "$(CFG)" == "pjmedia_codec - Win32 Release" - -!ELSEIF "$(CFG)" == "pjmedia_codec - Win32 Debug" - -# ADD CPP /W4 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\ilbc.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\ipp_codecs.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\l16.c" - -!IF "$(CFG)" == "pjmedia_codec - Win32 Release" - -!ELSEIF "$(CFG)" == "pjmedia_codec - Win32 Debug" - -# ADD CPP /W4 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\passthrough.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjmedia-codec\speex_codec.c" - -!IF "$(CFG)" == "pjmedia_codec - Win32 Release" - -!ELSEIF "$(CFG)" == "pjmedia_codec - Win32 Debug" - -# ADD CPP /W4 - -!ENDIF - -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\include\pjmedia-codec\amr_helper.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\config.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\g722.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\g7221.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\gsm.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\ilbc.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\ipp_codecs.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\l16.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\passthrough.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\speex.h" -# End Source File -# Begin Source File - -SOURCE="..\include\pjmedia-codec\types.h" -# End Source File -# End Group -# End Target -# End Project diff --git a/pjmedia/build/pjmedia_codec.vcproj b/pjmedia/build/pjmedia_codec.vcproj index 25cf77bf..d16e73f7 100644 --- a/pjmedia/build/pjmedia_codec.vcproj +++ b/pjmedia/build/pjmedia_codec.vcproj @@ -2764,6 +2764,10 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > + + @@ -2830,6 +2834,14 @@ /> + + + + @@ -3045,6 +3057,10 @@ RelativePath="..\include\pjmedia-codec\config.h" > + + @@ -3057,6 +3073,14 @@ RelativePath="..\include\pjmedia-codec\gsm.h" > + + + + diff --git a/pjmedia/build/pjmedia_test.dsp b/pjmedia/build/pjmedia_test.dsp deleted file mode 100644 index b5514976..00000000 --- a/pjmedia/build/pjmedia_test.dsp +++ /dev/null @@ -1,144 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjmedia_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=pjmedia_test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjmedia_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjmedia_test.mak" CFG="pjmedia_test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjmedia_test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pjmedia_test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjmedia_test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjmedia_test_vc6_Release" -# PROP BASE Intermediate_Dir ".\output\pjmedia_test_vc6_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjmedia_test_vc6_Release" -# PROP Intermediate_Dir ".\output\pjmedia_test_vc6_Release" -# 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" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjmedia_test_vc6.exe" - -!ELSEIF "$(CFG)" == "pjmedia_test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjmedia_test_vc6_Debug" -# PROP BASE Intermediate_Dir ".\output\pjmedia_test_vc6_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjmedia_test_vc6_Debug" -# PROP Intermediate_Dir ".\output\pjmedia_test_vc6_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../pjlib/include" /I "../include" /I "../../pjnath/include" /I "../../pjlib-util/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjmedia_test_vc6d.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pjmedia_test - Win32 Release" -# Name "pjmedia_test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\test\codec_vectors.c -# End Source File -# Begin Source File - -SOURCE=..\src\test\jbuf_test.c -# End Source File -# Begin Source File - -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 - -SOURCE=..\src\test\sdp_neg_test.c -# End Source File -# Begin Source File - -SOURCE=..\src\test\sdptest.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\test\session_test.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\test\test.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\src\test\test.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\JBTEST.DAT -# End Source File -# End Target -# End Project diff --git a/pjmedia/build/pjmedia_test.vcproj b/pjmedia/build/pjmedia_test.vcproj index bac1a3d4..5da8f9cc 100644 --- a/pjmedia/build/pjmedia_test.vcproj +++ b/pjmedia/build/pjmedia_test.vcproj @@ -11,16 +11,16 @@ Name="Win32" /> + + + + + + diff --git a/pjmedia/build/pjmedia_videodev.vcproj b/pjmedia/build/pjmedia_videodev.vcproj new file mode 100644 index 00000000..54d14f20 --- /dev/null +++ b/pjmedia/build/pjmedia_videodev.vcproj @@ -0,0 +1,2856 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3