Commit be584ae2 authored by jehan's avatar jehan

Merge branch 'master' of git://git.linphone.org/ortp

Conflicts:
	include/ortp/stun_udp.h
parents 5deb3282 54500d58
......@@ -3,4 +3,17 @@
*.la
configure
Makefile.in
missing
ltmain.sh
libtool
Makefile
.libs
aclocal.m4
config.guess
config.status
config.log
config.sub
depcomp
*~
autom4te.cache/
install-sh
June 3, 2010 : ortp-0.16.3
- cosmetics improvements for compilation.
May 10, 2010 : ortp-0.16.2
- add support for setting dscp on windows
- add accessors to struct PayloadType
September 17, 2009: ortp-0.16.1
- minor compilation fixes
......
......@@ -32,23 +32,18 @@ LOCAL_SRC_FILES := \
src/rtpparse.c \
src/rtpsession.c \
src/rtpsession_inet.c \
src/rtpsession_priv.h \
src/jitterctl.c \
src/jitterctl.h \
src/rtpsignaltable.c \
src/rtptimer.c \
src/rtptimer.h \
src/posixtimer.c \
src/ortp.c \
src/scheduler.c \
src/scheduler.h \
src/avprofile.c \
src/sessionset.c \
src/telephonyevents.c \
src/payloadtype.c \
src/rtcp.c \
src/utils.c \
src/utils.h \
src/rtcpparse.c \
src/event.c \
src/stun.c \
......

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oRTP", "oRTP.vcproj", "{4A07BB2B-F56E-4F1B-A719-D28B782AC128}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Debug|Win32.ActiveCfg = Debug|Win32
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Debug|Win32.Build.0 = Debug|Win32
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Release|Win32.ActiveCfg = Release|Win32
{4A07BB2B-F56E-4F1B-A719-D28B782AC128}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Version="9,00"
Name="oRTP"
ProjectGUID="{4A07BB2B-F56E-4F1B-A719-D28B782AC128}"
RootNamespace="oRTP"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
......@@ -42,9 +43,9 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;..\..\..\win32-bin\include&quot;;&quot;..\..\include&quot;;&quot;..\..\include\ortp&quot;;&quot;..\..\src&quot;;&quot;..\..\build\win32native\include&quot;"
PreprocessorDefinitions="HAVE_OPENSSL_HMAC_H;HAVE_OPENSSL_MD5_H;_CRT_SECURE_NO_DEPRECATE;ORTP_INET6;WIN32;_DEBUG;_WINDOWS;_USRDLL;ORTP_EXPORTS;WINDOW_NATIVE;_CRT_SECURE_NO_DEPRECATE"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ORTP_INET6;WIN32;_DEBUG;_WINDOWS;_USRDLL;ORTP_EXPORTS;WINDOW_NATIVE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
BasicRuntimeChecks="0"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
......@@ -61,14 +62,18 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libeay32.lib Ws2_32.lib libsrtp.lib Winmm.lib libcmtd.lib"
AdditionalDependencies="Ws2_32.lib delayimp.lib Winmm.lib qwave.lib"
OutputFile="ortp.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\win32-bin\lib&quot;"
IgnoreAllDefaultLibraries="true"
IgnoreAllDefaultLibraries="false"
ModuleDefinitionFile="oRTP.def"
DelayLoadDLLs="Qwave.dll"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/oRTP.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
......@@ -89,9 +94,6 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
......@@ -121,8 +123,9 @@
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="&quot;..\..\..\win32-bin\include&quot;;&quot;..\..\include&quot;;&quot;..\..\include\ortp&quot;;&quot;..\..\src&quot;;&quot;..\..\build\win32native\include&quot;"
PreprocessorDefinitions="HAVE_OPENSSL_HMAC_H;HAVE_OPENSSL_MD5_H;_CRT_SECURE_NO_DEPRECATE;ORTP_INET6;WIN32;NDEBUG;_WINDOWS;_USRDLL;ORTP_EXPORTS;WINDOW_NATIVE;_CRT_SECURE_NO_DEPRECATE"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ORTP_INET6;WIN32;NDEBUG;_WINDOWS;_USRDLL;ORTP_EXPORTS;WINDOW_NATIVE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
......@@ -141,15 +144,19 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libeay32.lib Ws2_32.lib libsrtp.lib Winmm.lib libcmt.lib"
AdditionalDependencies="Qwave.lib delayimp.lib Ws2_32.lib Winmm.lib "
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\..\win32-bin\lib&quot;"
IgnoreAllDefaultLibraries="true"
AdditionalLibraryDirectories=""
IgnoreAllDefaultLibraries="false"
ModuleDefinitionFile="oRTP.def"
DelayLoadDLLs="Qwave.dll"
AssemblyLinkResource=""
GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
......@@ -170,9 +177,6 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
......@@ -210,10 +214,6 @@
RelativePath="..\..\src\ortp.c"
>
</File>
<File
RelativePath=".\ortp.def"
>
</File>
<File
RelativePath="..\..\src\payloadtype.c"
>
......@@ -262,10 +262,6 @@
RelativePath="..\..\src\sessionset.c"
>
</File>
<File
RelativePath="..\..\src\srtp.c"
>
</File>
<File
RelativePath="..\..\src\str_utils.c"
>
......@@ -386,6 +382,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\ortp.def"
>
</File>
</Filter>
</Files>
<Globals>
......
LIBRARY ortp
EXPORTS
ortp_init
ortp_scheduler_init
ortp_exit
ortp_get_scheduler
ortp_set_log_file
ortp_set_log_level_mask
ortp_logv_out
ortp_set_log_handler
ortp_strdup_printf
ortp_logv
ortp_get_global_stats
ortp_global_stats_display
session_set_new
session_set_select
session_set_destroy
rtp_stats_display
rtp_session_get_stats
rtp_session_init
rtp_session_new
rtp_session_set_scheduling_mode
rtp_session_set_blocking_mode
rtp_session_set_profile
rtp_session_get_profile
rtp_session_set_data
rtp_session_set_ssrc_changed_threshold
rtp_session_signal_connect
rtp_session_signal_disconnect_by_callback
rtp_session_set_ssrc
rtp_session_set_seq_number
rtp_session_get_seq_number
rtp_session_set_jitter_compensation
rtp_session_set_local_addr
rtp_session_set_remote_addr
rtp_session_enable_adaptive_jitter_compensation
rtp_session_set_recv_buf_size
rtp_session_send_with_ts
rtp_session_sendm_with_ts
rtp_session_set_sockets
rtp_session_get_rtp_socket
rtp_session_get_rtcp_socket
rtp_session_set_payload_type
rtp_session_set_send_payload_type
rtp_session_get_send_payload_type
rtp_session_set_recv_payload_type
rtp_session_get_recv_payload_type
rtp_session_recv_with_ts
rtp_session_recvm_with_ts
rtp_session_create_packet
rtp_session_get_current_send_ts
rtp_session_get_current_recv_ts
rtp_session_reset
rtp_session_uninit
rtp_session_destroy
rtp_add_csrc
rtp_session_send_dtmf
rtp_session_add_telephone_event
rtp_session_create_telephone_event_packet
rtp_session_set_source_description
rtp_session_set_symmetric_rtp
rtp_profile_new
rtp_profile_set_payload
rtp_profile_clone_full
rtp_profile_destroy
rtp_profile_get_payload_from_rtpmap
payload_type_set_send_fmtp
payload_type_clone
fmtp_get_value
ortp_free
ortp_malloc
ortp_strdup
ortp_realloc
ortp_malloc0
freemsg
dupmsg
allocb
getq
putq
msgpullup
qinit
flushq
msgdsize
peekq
freeb
dupb
concatb
esballoc
WIN_thread_create
WIN_thread_join
WIN_cond_init
WIN_mutex_init
WIN_mutex_unlock
WIN_cond_wait
WIN_mutex_lock
WIN_cond_destroy
WIN_mutex_destroy
WIN_cond_signal
__ortp_log_mask
rtp_session_register_event_queue
rtp_session_unregister_event_queue
ortp_ev_queue_new
ortp_ev_queue_flush
ortp_ev_queue_get
ortp_ev_queue_destroy
ortp_event_get_type
ortp_event_get_data
ortp_event_destroy
stunParseHostName
stunParseServerName
sendMessage
stunEncodeMessage
stunBuildReqSimple
stunParseMessage
stunServerProcessMsg
stunNatType
stunTest
stunOpenSocket
stunOpenSocketPair
stunCalculateIntegrity_shortterm
stunCalculateIntegrity_longterm
stunCalculateFingerprint
getWinSocketError
rtp_session_set_transports
srtp_transport_new
ortp_srtp_init
ortp_srtp_create
ortp_srtp_dealloc
ortp_srtp_add_stream
rtp_session_set_dscp
rtp_session_compute_recv_bandwidth
rtp_session_compute_send_bandwidth
rtcp_next_packet
rtcp_is_SDES
rtcp_sdes_parse
rtcp_is_SR
rtcp_SR_get_ssrc
rtcp_SR_get_report_block
rtcp_SR_get_sender_info
rtcp_is_RR
rtcp_RR_get_ssrc
rtcp_RR_get_report_block
rtcp_is_BYE
rtcp_BYE_get_ssrc
rtcp_BYE_get_reason
LIBRARY ortp
EXPORTS
ortp_init
ortp_scheduler_init
ortp_exit
ortp_get_scheduler
ortp_set_log_file
ortp_set_log_level_mask
ortp_logv_out
ortp_set_log_handler
ortp_strdup_printf
ortp_logv
ortp_get_global_stats
ortp_global_stats_display
session_set_new
session_set_select
session_set_destroy
rtp_stats_display
rtp_session_get_stats
rtp_session_init
rtp_session_new
rtp_session_set_scheduling_mode
rtp_session_set_blocking_mode
rtp_session_set_profile
rtp_session_get_profile
rtp_session_set_data
rtp_session_set_ssrc_changed_threshold
rtp_session_signal_connect
rtp_session_signal_disconnect_by_callback
rtp_session_set_ssrc
rtp_session_set_seq_number
rtp_session_get_seq_number
rtp_session_set_jitter_compensation
rtp_session_set_local_addr
rtp_session_set_remote_addr
rtp_session_enable_adaptive_jitter_compensation
rtp_session_set_recv_buf_size
rtp_session_send_with_ts
rtp_session_sendm_with_ts
rtp_session_set_sockets
rtp_session_get_rtp_socket
rtp_session_get_rtcp_socket
rtp_session_set_payload_type
rtp_session_set_send_payload_type
rtp_session_get_send_payload_type
rtp_session_set_recv_payload_type
rtp_session_get_recv_payload_type
rtp_session_recv_with_ts
rtp_session_recvm_with_ts
rtp_session_create_packet
rtp_session_get_current_send_ts
rtp_session_get_current_recv_ts
rtp_session_reset
rtp_session_uninit
rtp_session_destroy
rtp_add_csrc
rtp_session_send_dtmf
rtp_session_add_telephone_event
rtp_session_create_telephone_event_packet
rtp_session_set_source_description
rtp_session_set_symmetric_rtp
rtp_profile_new
rtp_profile_set_payload
rtp_profile_clone_full
rtp_profile_destroy
rtp_profile_get_payload_from_rtpmap
payload_type_set_send_fmtp
payload_type_clone
fmtp_get_value
ortp_free
ortp_malloc
ortp_strdup
ortp_realloc
ortp_malloc0
freemsg
dupmsg
allocb
getq
putq
msgpullup
qinit
flushq
msgdsize
peekq
freeb
dupb
concatb
esballoc
copyb
copymsg
WIN_thread_create
WIN_thread_join
WIN_cond_init
WIN_mutex_init
WIN_mutex_unlock
WIN_cond_wait
WIN_mutex_lock
WIN_cond_destroy
WIN_mutex_destroy
WIN_cond_signal
__ortp_log_mask
rtp_session_register_event_queue
rtp_session_unregister_event_queue
ortp_ev_queue_new
ortp_ev_queue_flush
ortp_ev_queue_get
ortp_ev_queue_destroy
ortp_event_get_type
ortp_event_get_data
ortp_event_destroy
stunParseHostName
stunParseServerName
sendMessage
stunEncodeMessage
stunBuildReqSimple
stunParseMessage
stunServerProcessMsg
stunNatType
stunTest
stunOpenSocket
stunOpenSocketPair
stunCalculateIntegrity_shortterm
stunCalculateIntegrity_longterm
stunCalculateFingerprint
getWinSocketError
rtp_session_set_transports
rtp_session_set_dscp
rtp_session_compute_recv_bandwidth
rtp_session_compute_send_bandwidth
rtcp_next_packet
rtcp_is_SDES
rtcp_sdes_parse
rtcp_is_SR
rtcp_SR_get_ssrc
rtcp_SR_get_report_block
rtcp_SR_get_sender_info
rtcp_is_RR
rtcp_RR_get_ssrc
rtcp_RR_get_report_block
rtcp_is_BYE
rtcp_BYE_get_ssrc
rtcp_BYE_get_reason
rtcp_is_APP
rtcp_APP_get_subtype
rtcp_APP_get_ssrc
rtcp_APP_get_name
rtcp_APP_get_data
rtp_session_flush_sockets
rtp_session_resync
rtp_session_set_remote_addr_and_port
rtp_session_set_time_jump_limit
copymsg
rtp_session_enable_jitter_buffer
rtp_session_set_rtp_socket_recv_buffer_size
rtp_session_set_rtp_socket_send_buffer_size
rtp_session_set_jitter_buffer_params
rtp_get_payload
rtp_session_set_remote_addr_full
rtp_session_send_rtcp_APP
b64_decode
b64_encode
payload_type_set_recv_fmtp
rtp_session_get_local_port
rtp_session_get_jitter_buffer_params
copyb
turnAllocateSocketPair
rtcp_APP_get_data
rtp_session_flush_sockets
rtp_session_resync
rtp_session_set_remote_addr_and_port
rtp_session_set_time_jump_limit
rtp_session_enable_jitter_buffer
rtp_session_set_rtp_socket_recv_buffer_size
rtp_session_set_rtp_socket_send_buffer_size
rtp_session_set_jitter_buffer_params
rtp_get_payload
rtp_session_set_remote_addr_full
rtp_session_send_rtcp_APP
b64_decode
b64_encode
payload_type_set_recv_fmtp
rtp_session_get_local_port
rtp_session_get_jitter_buffer_params
turnAllocateSocketPair
ortp_shm_open
ortp_shm_close
ortp_pipe_read
ortp_pipe_write
ortp_client_pipe_connect
ortp_client_pipe_close
ortp_file_exist
dnl Process this file with autoconf to produce a configure script.
AC_INIT([ortp],[0.16.1])
AC_INIT([ortp],[0.16.3])
AC_CANONICAL_SYSTEM
dnl Source packaging numbers
......@@ -240,7 +240,7 @@ fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(poll.h sys/poll.h sys/uio.h fcntl.h sys/time.h unistd.h sys/audio.h linux/soundcard.h)
AC_CHECK_HEADERS(poll.h sys/poll.h sys/uio.h fcntl.h sys/time.h unistd.h sys/audio.h linux/soundcard.h sys/shm.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
......
......@@ -201,6 +201,7 @@ VAR_DECLSPEC PayloadType payload_type_x_snow;
VAR_DECLSPEC PayloadType payload_type_jpeg;
VAR_DECLSPEC PayloadType payload_type_t140;
VAR_DECLSPEC PayloadType payload_type_g722;
/* non standard file transfer over UDP */
VAR_DECLSPEC PayloadType payload_type_x_udpftp;
......
......@@ -259,8 +259,8 @@ typedef struct _OrtpMemoryFunctions{
void ortp_set_memory_functions(OrtpMemoryFunctions *functions);
#define ortp_new(type,count) ortp_malloc(sizeof(type)*(count))
#define ortp_new0(type,count) ortp_malloc0(sizeof(type)*(count))
#define ortp_new(type,count) (type*)ortp_malloc(sizeof(type)*(count))
#define ortp_new0(type,count) (type*)ortp_malloc0(sizeof(type)*(count))
int close_socket(ortp_socket_t sock);
int set_non_blocking_socket(ortp_socket_t sock);
......@@ -271,7 +271,7 @@ char *ortp_strdup_vprintf(const char *fmt, va_list ap);
int ortp_file_exist(const char *pathname);