r2615 - in trunk/libminisip: . include include/libminisip
include/libminisip/aec include/libminisip/codecs
include/libminisip/conference
include/libminisip/configbackend include/libminisip/contactdb
include/libminisip/gui include/libminisip/ipprovider
include/libminisip/ipsec include/libminisip/mediahandler
include/libminisip/p2t include/libminisip/rtp
include/libminisip/sdp include/libminisip/sip
include/libminisip/soundcard include/libminisip/spaudio
include/libminisip/video include/libminisip/video/codec
include/libminisip/video/display include/libminisip/video/grabber
include/libminisip/video/mixer include/libminisip/zrtp m4
source source/aec source/codecs source/codecs/g711
source/conference source/configbackend source/contactdb
source/gui source/ipprovider source/ipsec source/mediahandler
source/p2t source/rtp source/sdp source/sip source/soundcard
source/soundcard/resampler source/spaudio source/video
source/video/codec source/video/display source/video/examples
source/video/grabber source/video/mixer source/win32 source/zrtp
mikma at minisip.org
mikma at minisip.org
Sun Jun 4 12:36:06 CEST 2006
Author: mikma
Date: 2006-06-04 12:36:05 +0200 (Sun, 04 Jun 2006)
New Revision: 2615
Modified:
trunk/libminisip/AUTHORS
trunk/libminisip/COPYING.LIB
trunk/libminisip/ChangeLog
trunk/libminisip/INSTALL
trunk/libminisip/Makefile.am
trunk/libminisip/NEWS
trunk/libminisip/README
trunk/libminisip/TODO
trunk/libminisip/bootstrap
trunk/libminisip/configure.ac
trunk/libminisip/include/Makefile.am
trunk/libminisip/include/compilation_config_w32_wce.h
trunk/libminisip/include/config.h
trunk/libminisip/include/libminisip/Minisip.h
trunk/libminisip/include/libminisip/aec/aec.h
trunk/libminisip/include/libminisip/aec/aecfix.h
trunk/libminisip/include/libminisip/codecs/Codec.h
trunk/libminisip/include/libminisip/conference/ConfCallback.h
trunk/libminisip/include/libminisip/conference/ConfMember.h
trunk/libminisip/include/libminisip/conference/ConfMessageRouter.h
trunk/libminisip/include/libminisip/conference/ConferenceControl.h
trunk/libminisip/include/libminisip/configbackend/ConfBackend.h
trunk/libminisip/include/libminisip/configbackend/UserConfig.h
trunk/libminisip/include/libminisip/contactdb/ContactDb.h
trunk/libminisip/include/libminisip/contactdb/MXmlPhoneBookIo.h
trunk/libminisip/include/libminisip/contactdb/PhoneBook.h
trunk/libminisip/include/libminisip/gui/Bell.h
trunk/libminisip/include/libminisip/gui/ConsoleDebugger.h
trunk/libminisip/include/libminisip/gui/Gui.h
trunk/libminisip/include/libminisip/gui/LogEntry.h
trunk/libminisip/include/libminisip/ipprovider/IpProvider.h
trunk/libminisip/include/libminisip/ipprovider/SimpleIpProvider.h
trunk/libminisip/include/libminisip/ipprovider/StunIpProvider.h
trunk/libminisip/include/libminisip/ipsec/MsipIpsecAPI.h
trunk/libminisip/include/libminisip/ipsec/libpfkey.h
trunk/libminisip/include/libminisip/libminisip_config.h
trunk/libminisip/include/libminisip/mediahandler/AudioMedia.h
trunk/libminisip/include/libminisip/mediahandler/DtmfSender.h
trunk/libminisip/include/libminisip/mediahandler/Media.h
trunk/libminisip/include/libminisip/mediahandler/MediaCommandString.h
trunk/libminisip/include/libminisip/mediahandler/MediaHandler.h
trunk/libminisip/include/libminisip/mediahandler/MediaStream.h
trunk/libminisip/include/libminisip/mediahandler/RtpReceiver.h
trunk/libminisip/include/libminisip/mediahandler/Session.h
trunk/libminisip/include/libminisip/mediahandler/SessionRegistry.h
trunk/libminisip/include/libminisip/p2t/GroupList.h
trunk/libminisip/include/libminisip/p2t/GroupListClient.h
trunk/libminisip/include/libminisip/p2t/GroupListServer.h
trunk/libminisip/include/libminisip/p2t/GroupListUserElement.h
trunk/libminisip/include/libminisip/p2t/P2T.h
trunk/libminisip/include/libminisip/p2t/RtcpAPP.h
trunk/libminisip/include/libminisip/p2t/RtcpAPPHeader.h
trunk/libminisip/include/libminisip/p2t/RtcpReceiver.h
trunk/libminisip/include/libminisip/p2t/RtcpSender.h
trunk/libminisip/include/libminisip/p2t/RtcpTransactionGetFloor.h
trunk/libminisip/include/libminisip/p2t/RtcpTransactionGrantFloor.h
trunk/libminisip/include/libminisip/p2t/RtcpTransactionIdleFloor.h
trunk/libminisip/include/libminisip/p2t/RtcpTransactionReleaseFloor.h
trunk/libminisip/include/libminisip/p2t/RtcpTransactionTakenFloor.h
trunk/libminisip/include/libminisip/p2t/SipDialogP2T.h
trunk/libminisip/include/libminisip/p2t/SipDialogP2Tuser.h
trunk/libminisip/include/libminisip/rtp/CryptoContext.h
trunk/libminisip/include/libminisip/rtp/RtcpDebugMonitor.h
trunk/libminisip/include/libminisip/rtp/RtcpPacket.h
trunk/libminisip/include/libminisip/rtp/RtcpReport.h
trunk/libminisip/include/libminisip/rtp/RtcpReportRR.h
trunk/libminisip/include/libminisip/rtp/RtcpReportReceptionBlock.h
trunk/libminisip/include/libminisip/rtp/RtcpReportSDES.h
trunk/libminisip/include/libminisip/rtp/RtcpReportSR.h
trunk/libminisip/include/libminisip/rtp/RtcpReportSenderInfo.h
trunk/libminisip/include/libminisip/rtp/RtcpReportXR.h
trunk/libminisip/include/libminisip/rtp/RtpHeader.h
trunk/libminisip/include/libminisip/rtp/RtpPacket.h
trunk/libminisip/include/libminisip/rtp/SDESChunk.h
trunk/libminisip/include/libminisip/rtp/SDESItem.h
trunk/libminisip/include/libminisip/rtp/SDES_CNAME.h
trunk/libminisip/include/libminisip/rtp/SDES_EMAIL.h
trunk/libminisip/include/libminisip/rtp/SDES_LOC.h
trunk/libminisip/include/libminisip/rtp/SDES_NAME.h
trunk/libminisip/include/libminisip/rtp/SDES_NOTE.h
trunk/libminisip/include/libminisip/rtp/SDES_PHONE.h
trunk/libminisip/include/libminisip/rtp/SDES_TOOL.h
trunk/libminisip/include/libminisip/rtp/SRtpPacket.h
trunk/libminisip/include/libminisip/rtp/XRReportBlock.h
trunk/libminisip/include/libminisip/rtp/XRVoIPReportBlock.h
trunk/libminisip/include/libminisip/sdp/SdpHeader.h
trunk/libminisip/include/libminisip/sdp/SdpHeaderA.h
trunk/libminisip/include/libminisip/sdp/SdpHeaderC.h
trunk/libminisip/include/libminisip/sdp/SdpHeaderM.h
trunk/libminisip/include/libminisip/sdp/SdpHeaderO.h
trunk/libminisip/include/libminisip/sdp/SdpHeaderS.h
trunk/libminisip/include/libminisip/sdp/SdpHeaderT.h
trunk/libminisip/include/libminisip/sdp/SdpHeaderV.h
trunk/libminisip/include/libminisip/sdp/SdpPacket.h
trunk/libminisip/include/libminisip/sip/DefaultDialogHandler.h
trunk/libminisip/include/libminisip/sip/PresenceMessageContent.h
trunk/libminisip/include/libminisip/sip/Sip.h
trunk/libminisip/include/libminisip/sip/SipDialogConfVoip.h
trunk/libminisip/include/libminisip/sip/SipDialogPresenceClient.h
trunk/libminisip/include/libminisip/sip/SipDialogPresenceServer.h
trunk/libminisip/include/libminisip/sip/SipDialogSecurityConfig.h
trunk/libminisip/include/libminisip/sip/SipDialogVoip.h
trunk/libminisip/include/libminisip/sip/SipDialogVoipClient.h
trunk/libminisip/include/libminisip/sip/SipDialogVoipServer.h
trunk/libminisip/include/libminisip/sip/SipDialogVoipServer100rel.h
trunk/libminisip/include/libminisip/sip/SipSoftPhoneConfiguration.h
trunk/libminisip/include/libminisip/soundcard/AudioMixer.h
trunk/libminisip/include/libminisip/soundcard/AudioMixerSimple.h
trunk/libminisip/include/libminisip/soundcard/AudioMixerSpatial.h
trunk/libminisip/include/libminisip/soundcard/FileSoundDevice.h
trunk/libminisip/include/libminisip/soundcard/FileSoundSource.h
trunk/libminisip/include/libminisip/soundcard/OssSoundDevice.h
trunk/libminisip/include/libminisip/soundcard/Resampler.h
trunk/libminisip/include/libminisip/soundcard/SilenceSensor.h
trunk/libminisip/include/libminisip/soundcard/SoundDevice.h
trunk/libminisip/include/libminisip/soundcard/SoundDriver.h
trunk/libminisip/include/libminisip/soundcard/SoundDriverRegistry.h
trunk/libminisip/include/libminisip/soundcard/SoundIO.h
trunk/libminisip/include/libminisip/soundcard/SoundIOPLCInterface.h
trunk/libminisip/include/libminisip/soundcard/SoundRecorderCallback.h
trunk/libminisip/include/libminisip/soundcard/SoundSource.h
trunk/libminisip/include/libminisip/soundcard/WaveSoundDevice.h
trunk/libminisip/include/libminisip/spaudio/SpAudio.h
trunk/libminisip/include/libminisip/video/ImageHandler.h
trunk/libminisip/include/libminisip/video/VideoException.h
trunk/libminisip/include/libminisip/video/VideoMedia.h
trunk/libminisip/include/libminisip/video/codec/AVCoder.h
trunk/libminisip/include/libminisip/video/codec/AVDecoder.h
trunk/libminisip/include/libminisip/video/codec/VideoCodec.h
trunk/libminisip/include/libminisip/video/codec/VideoEncoderCallback.h
trunk/libminisip/include/libminisip/video/display/VideoDisplay.h
trunk/libminisip/include/libminisip/video/grabber/Grabber.h
trunk/libminisip/include/libminisip/video/mixer/ImageMixer.h
trunk/libminisip/include/libminisip/zrtp/ZIDFile.h
trunk/libminisip/include/libminisip/zrtp/ZIDRecord.h
trunk/libminisip/include/libminisip/zrtp/ZRtp.h
trunk/libminisip/include/libminisip/zrtp/ZrtpCallback.h
trunk/libminisip/include/libminisip/zrtp/ZrtpHostBridgeMinisip.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketBase.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketCommit.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketConf2Ack.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketConfirm.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketDHPart.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketError.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketHello.h
trunk/libminisip/include/libminisip/zrtp/ZrtpPacketHelloAck.h
trunk/libminisip/include/libminisip/zrtp/ZrtpStateClass.h
trunk/libminisip/include/libminisip/zrtp/ZrtpStates.h
trunk/libminisip/include/libminisip/zrtp/ZrtpTextData.h
trunk/libminisip/include/libminisip/zrtp/zrtpPacket.h
trunk/libminisip/include/minisip_wce_extra_includes.h
trunk/libminisip/libminisip.pc.in
trunk/libminisip/libminisip.spec
trunk/libminisip/m4/Makefile.am
trunk/libminisip/m4/libminisip.m4
trunk/libminisip/source/Minisip.cxx
trunk/libminisip/source/aec/aec.cxx
trunk/libminisip/source/aec/aec_test.cpp
trunk/libminisip/source/aec/aecfix.cpp
trunk/libminisip/source/aec/soundmode
trunk/libminisip/source/codecs/Codec.cxx
trunk/libminisip/source/codecs/G711CODEC.cxx
trunk/libminisip/source/codecs/G711CODEC.h
trunk/libminisip/source/codecs/GsmCodec.cxx
trunk/libminisip/source/codecs/GsmCodec.h
trunk/libminisip/source/codecs/SPEEXCODEC.cxx
trunk/libminisip/source/codecs/SPEEXCODEC.h
trunk/libminisip/source/codecs/g711/codec_g711.cxx
trunk/libminisip/source/codecs/g711/codec_g711.h
trunk/libminisip/source/conference/ConfCallback.cxx
trunk/libminisip/source/conference/ConfMessageRouter.cxx
trunk/libminisip/source/conference/ConferenceControl.cxx
trunk/libminisip/source/conference/doc++.conf
trunk/libminisip/source/configbackend/ConfBackend.cxx
trunk/libminisip/source/configbackend/GConfBackend.cxx
trunk/libminisip/source/configbackend/GConfBackend.h
trunk/libminisip/source/configbackend/MXmlConfBackend.cxx
trunk/libminisip/source/configbackend/MXmlConfBackend.h
trunk/libminisip/source/configbackend/UserConfigPosix.cxx
trunk/libminisip/source/configbackend/UserConfigWin32.cxx
trunk/libminisip/source/contactdb/ContactDb.cxx
trunk/libminisip/source/contactdb/MXmlPhoneBookIo.cxx
trunk/libminisip/source/contactdb/PhoneBook.cxx
trunk/libminisip/source/gui/Bell.cxx
trunk/libminisip/source/gui/ConsoleDebugger.cxx
trunk/libminisip/source/gui/Gui.cxx
trunk/libminisip/source/gui/LogEntry.cxx
trunk/libminisip/source/ipprovider/IpProvider.cxx
trunk/libminisip/source/ipprovider/SimpleIp6Provider.cxx
trunk/libminisip/source/ipprovider/SimpleIp6Provider.h
trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
trunk/libminisip/source/ipprovider/StunIpProvider.cxx
trunk/libminisip/source/ipsec/MsipIpsecAPI.cxx
trunk/libminisip/source/ipsec/README
trunk/libminisip/source/mediahandler/AudioMedia.cxx
trunk/libminisip/source/mediahandler/AudioPlugin.cxx
trunk/libminisip/source/mediahandler/AudioPlugin.h
trunk/libminisip/source/mediahandler/DtmfSender.cxx
trunk/libminisip/source/mediahandler/KeyAgreement.cxx
trunk/libminisip/source/mediahandler/Media.cxx
trunk/libminisip/source/mediahandler/MediaCommandString.cxx
trunk/libminisip/source/mediahandler/MediaHandler.cxx
trunk/libminisip/source/mediahandler/MediaStream.cxx
trunk/libminisip/source/mediahandler/RtpReceiver.cxx
trunk/libminisip/source/mediahandler/Session.cxx
trunk/libminisip/source/mediahandler/SessionRegistry.cxx
trunk/libminisip/source/p2t/GroupList.cxx
trunk/libminisip/source/p2t/GroupListClient.cxx
trunk/libminisip/source/p2t/GroupListServer.cxx
trunk/libminisip/source/p2t/GroupListUserElement.cxx
trunk/libminisip/source/p2t/P2T.cxx
trunk/libminisip/source/p2t/RtcpAPP.cxx
trunk/libminisip/source/p2t/RtcpAPPHeader.cxx
trunk/libminisip/source/p2t/RtcpReceiver.cxx
trunk/libminisip/source/p2t/RtcpSender.cxx
trunk/libminisip/source/p2t/RtcpTransactionGetFloor.cxx
trunk/libminisip/source/p2t/RtcpTransactionGrantFloor.cxx
trunk/libminisip/source/p2t/RtcpTransactionIdleFloor.cxx
trunk/libminisip/source/p2t/RtcpTransactionReleaseFloor.cxx
trunk/libminisip/source/p2t/RtcpTransactionTakenFloor.cxx
trunk/libminisip/source/p2t/SipDialogP2T.cxx
trunk/libminisip/source/p2t/SipDialogP2Tuser.cxx
trunk/libminisip/source/p2t/doc++.conf
trunk/libminisip/source/p2t/doc++.files
trunk/libminisip/source/rtp/CryptoContext.cxx
trunk/libminisip/source/rtp/RtcpDebugMonitor.cxx
trunk/libminisip/source/rtp/RtcpPacket.cxx
trunk/libminisip/source/rtp/RtcpReport.cxx
trunk/libminisip/source/rtp/RtcpReportRR.cxx
trunk/libminisip/source/rtp/RtcpReportReceptionBlock.cxx
trunk/libminisip/source/rtp/RtcpReportSDES.cxx
trunk/libminisip/source/rtp/RtcpReportSR.cxx
trunk/libminisip/source/rtp/RtcpReportSenderInfo.cxx
trunk/libminisip/source/rtp/RtcpReportXR.cxx
trunk/libminisip/source/rtp/RtpHeader.cxx
trunk/libminisip/source/rtp/RtpPacket.cxx
trunk/libminisip/source/rtp/SDESChunk.cxx
trunk/libminisip/source/rtp/SDESItem.cxx
trunk/libminisip/source/rtp/SDES_CNAME.cxx
trunk/libminisip/source/rtp/SDES_EMAIL.cxx
trunk/libminisip/source/rtp/SDES_LOC.cxx
trunk/libminisip/source/rtp/SDES_NAME.cxx
trunk/libminisip/source/rtp/SDES_NOTE.cxx
trunk/libminisip/source/rtp/SDES_PHONE.cxx
trunk/libminisip/source/rtp/SDES_TOOL.cxx
trunk/libminisip/source/rtp/SRtpPacket.cxx
trunk/libminisip/source/rtp/XRReportBlock.cxx
trunk/libminisip/source/rtp/XRVoIPReportBlock.cxx
trunk/libminisip/source/sdp/SdpHeader.cxx
trunk/libminisip/source/sdp/SdpHeaderA.cxx
trunk/libminisip/source/sdp/SdpHeaderC.cxx
trunk/libminisip/source/sdp/SdpHeaderM.cxx
trunk/libminisip/source/sdp/SdpHeaderO.cxx
trunk/libminisip/source/sdp/SdpHeaderS.cxx
trunk/libminisip/source/sdp/SdpHeaderT.cxx
trunk/libminisip/source/sdp/SdpHeaderV.cxx
trunk/libminisip/source/sdp/SdpPacket.cxx
trunk/libminisip/source/sip/DefaultDialogHandler.cxx
trunk/libminisip/source/sip/PresenceMessageContent.cxx
trunk/libminisip/source/sip/Sip.cxx
trunk/libminisip/source/sip/SipDialogConfVoip.cxx
trunk/libminisip/source/sip/SipDialogPresenceClient.cxx
trunk/libminisip/source/sip/SipDialogPresenceServer.cxx
trunk/libminisip/source/sip/SipDialogSecurityConfig.cxx
trunk/libminisip/source/sip/SipDialogVoip.cxx
trunk/libminisip/source/sip/SipDialogVoipClient.cxx
trunk/libminisip/source/sip/SipDialogVoipServer.cxx
trunk/libminisip/source/sip/SipDialogVoipServer100rel.cxx
trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
trunk/libminisip/source/soundcard/AlsaCard.cxx
trunk/libminisip/source/soundcard/AlsaCard.h
trunk/libminisip/source/soundcard/AlsaSoundDevice.cxx
trunk/libminisip/source/soundcard/AlsaSoundDevice.h
trunk/libminisip/source/soundcard/AudioMixer.cxx
trunk/libminisip/source/soundcard/AudioMixerSimple.cxx
trunk/libminisip/source/soundcard/AudioMixerSpatial.cxx
trunk/libminisip/source/soundcard/DirectSoundDevice.cxx
trunk/libminisip/source/soundcard/DirectSoundDevice.h
trunk/libminisip/source/soundcard/FileSoundDevice.cxx
trunk/libminisip/source/soundcard/FileSoundSource.cxx
trunk/libminisip/source/soundcard/OssSoundDevice.cxx
trunk/libminisip/source/soundcard/PortAudioDevice.cxx
trunk/libminisip/source/soundcard/PortAudioDevice.h
trunk/libminisip/source/soundcard/PortAudioDriver.cxx
trunk/libminisip/source/soundcard/PortAudioDriver.h
trunk/libminisip/source/soundcard/SilenceSensor.cxx
trunk/libminisip/source/soundcard/SoundDevice.cxx
trunk/libminisip/source/soundcard/SoundDriver.cxx
trunk/libminisip/source/soundcard/SoundDriverRegistry.cxx
trunk/libminisip/source/soundcard/SoundIO.cxx
trunk/libminisip/source/soundcard/SoundSource.cxx
trunk/libminisip/source/soundcard/WaveSoundDevice.cpp
trunk/libminisip/source/soundcard/resampler/FloatResampler.cxx
trunk/libminisip/source/soundcard/resampler/FloatResampler.h
trunk/libminisip/source/soundcard/resampler/Resampler.cxx
trunk/libminisip/source/soundcard/resampler/SimpleResampler.cxx
trunk/libminisip/source/soundcard/resampler/SimpleResampler.h
trunk/libminisip/source/spaudio/SpAudio.cxx
trunk/libminisip/source/video/VideoMedia.cxx
trunk/libminisip/source/video/VideoPlugin.cxx
trunk/libminisip/source/video/codec/AVCoder.cxx
trunk/libminisip/source/video/codec/AVDecoder.cxx
trunk/libminisip/source/video/codec/VideoCodec.cxx
trunk/libminisip/source/video/display/SdlDisplay.cxx
trunk/libminisip/source/video/display/SdlDisplay.h
trunk/libminisip/source/video/display/VideoDisplay.cxx
trunk/libminisip/source/video/display/X11Display.cxx
trunk/libminisip/source/video/display/X11Display.h
trunk/libminisip/source/video/display/XvDisplay.cxx
trunk/libminisip/source/video/display/XvDisplay.h
trunk/libminisip/source/video/examples/Makefile
trunk/libminisip/source/video/examples/view.cxx
trunk/libminisip/source/video/grabber/Dc1394Grabber.cxx
trunk/libminisip/source/video/grabber/Dc1394Grabber.h
trunk/libminisip/source/video/grabber/Grabber.cxx
trunk/libminisip/source/video/grabber/V4LGrabber.cxx
trunk/libminisip/source/video/grabber/V4LGrabber.h
trunk/libminisip/source/video/mixer/ImageMixer.cxx
trunk/libminisip/source/win32/libminisip-res.rc.in
trunk/libminisip/source/zrtp/ZIDFile.cxx
trunk/libminisip/source/zrtp/ZIDRecord.cxx
trunk/libminisip/source/zrtp/ZRtp.cxx
trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx
trunk/libminisip/source/zrtp/ZrtpPacketCommit.cxx
trunk/libminisip/source/zrtp/ZrtpPacketConf2Ack.cxx
trunk/libminisip/source/zrtp/ZrtpPacketConfirm.cxx
trunk/libminisip/source/zrtp/ZrtpPacketDHPart.cxx
trunk/libminisip/source/zrtp/ZrtpPacketError.cxx
trunk/libminisip/source/zrtp/ZrtpPacketHello.cxx
trunk/libminisip/source/zrtp/ZrtpPacketHelloAck.cxx
trunk/libminisip/source/zrtp/ZrtpStateClass.cxx
trunk/libminisip/source/zrtp/ZrtpTextData.cxx
Log:
Set svn:mime-type=text/plain and svn:eol-style=native on all text files
in libminisip.
It will prevent eol style changes in the future.
Property changes on: trunk/libminisip/AUTHORS
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/COPYING.LIB
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/ChangeLog
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/INSTALL
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/Makefile.am
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/NEWS
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/README
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/TODO
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/bootstrap
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/configure.ac
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/Makefile.am
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libminisip/include/compilation_config_w32_wce.h
===================================================================
--- trunk/libminisip/include/compilation_config_w32_wce.h 2006-06-04 10:27:21 UTC (rev 2614)
+++ trunk/libminisip/include/compilation_config_w32_wce.h 2006-06-04 10:36:05 UTC (rev 2615)
@@ -1,86 +1,86 @@
-#ifndef _MINISIPLIB_COMPILATION_CONFIG
-#define _MINISIPLIB_COMPILATION_CONFIG
-
-#ifdef _WIN32_WCE
-/* Debug output */
-#define DEBUG_OUTPUT
-
-//use this to avoid the warning (coming from STLPort used in WinCE)
-//exception.h(47) : warning C4275: non dll-interface class 'std::exception' used as base for dll-interface class 'Exception'
-//#pragma warning (disable: 4275)
-
-/* Define to 1 if you have the `iphlpapi' library (-liphlpapi).
-This is for the GetAdaptersInfo ...
-*/
-#define HAVE_LIBIPHLPAPI 1
-
-/* Define to 1 if you have the `wsock32' library (-lwsock32). */
-//must have it ... but can't find it :)
-#define HAVE_LIBWSOCK32 1
-
-/* Define to 1 if you have the <ws2tcpip.h> header file. */
-#define HAVE_WS2TCPIP_H 1
-
-/* Define to 1 if the system has the type `struct sockaddr_in6'. */
-//the struct is defined in ws2tcpip.h ...
-//AF_INETXXX are defined in winsock2.h and winsock.h
-#define HAVE_STRUCT_SOCKADDR_IN6 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-//#define HAVE_UNISTD_H 1
-
-/* No Kerberos in OpenSSL */
-#define OPENSSL_NO_KRB5
-
-/* Name of package */
-#define PACKAGE "libmnetutil"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "eliasson at imit.kth.se"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libmnetutil"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libmnetutil 0.3"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libmnetutil"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.3"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* STL enabled */
-#define USE_STL
-
-/* Version number of package */
-#define VERSION "0.3.1"
-
-#endif
-
-#endif
-//#ifndef _MINISIPLIB_COMPILATION_CONFIG
+#ifndef _MINISIPLIB_COMPILATION_CONFIG
+#define _MINISIPLIB_COMPILATION_CONFIG
+
+#ifdef _WIN32_WCE
+/* Debug output */
+#define DEBUG_OUTPUT
+
+//use this to avoid the warning (coming from STLPort used in WinCE)
+//exception.h(47) : warning C4275: non dll-interface class 'std::exception' used as base for dll-interface class 'Exception'
+//#pragma warning (disable: 4275)
+
+/* Define to 1 if you have the `iphlpapi' library (-liphlpapi).
+This is for the GetAdaptersInfo ...
+*/
+#define HAVE_LIBIPHLPAPI 1
+
+/* Define to 1 if you have the `wsock32' library (-lwsock32). */
+//must have it ... but can't find it :)
+#define HAVE_LIBWSOCK32 1
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+#define HAVE_WS2TCPIP_H 1
+
+/* Define to 1 if the system has the type `struct sockaddr_in6'. */
+//the struct is defined in ws2tcpip.h ...
+//AF_INETXXX are defined in winsock2.h and winsock.h
+#define HAVE_STRUCT_SOCKADDR_IN6 1
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+//#define HAVE_UNISTD_H 1
+
+/* No Kerberos in OpenSSL */
+#define OPENSSL_NO_KRB5
+
+/* Name of package */
+#define PACKAGE "libmnetutil"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "eliasson at imit.kth.se"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libmnetutil"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libmnetutil 0.3"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libmnetutil"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.3"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* STL enabled */
+#define USE_STL
+
+/* Version number of package */
+#define VERSION "0.3.1"
+
+#endif
+
+#endif
+//#ifndef _MINISIPLIB_COMPILATION_CONFIG
Property changes on: trunk/libminisip/include/compilation_config_w32_wce.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/config.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/Minisip.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/aec/aec.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/aec/aecfix.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/codecs/Codec.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/conference/ConfCallback.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/conference/ConfMember.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/conference/ConfMessageRouter.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/conference/ConferenceControl.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/configbackend/ConfBackend.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/configbackend/UserConfig.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/contactdb/ContactDb.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/contactdb/MXmlPhoneBookIo.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/contactdb/PhoneBook.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/gui/Bell.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/gui/ConsoleDebugger.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/gui/Gui.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/gui/LogEntry.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/ipprovider/IpProvider.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/ipprovider/SimpleIpProvider.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/ipprovider/StunIpProvider.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/ipsec/MsipIpsecAPI.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/ipsec/libpfkey.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/libminisip_config.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/AudioMedia.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/DtmfSender.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/Media.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/MediaCommandString.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/MediaHandler.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libminisip/include/libminisip/mediahandler/MediaStream.h
===================================================================
--- trunk/libminisip/include/libminisip/mediahandler/MediaStream.h 2006-06-04 10:27:21 UTC (rev 2614)
+++ trunk/libminisip/include/libminisip/mediahandler/MediaStream.h 2006-06-04 10:36:05 UTC (rev 2615)
@@ -1,477 +1,477 @@
-/*
- Copyright (C) 2004-2006 the Minisip Team
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* Copyright (C) 2004, 2005
- *
- * Authors: Erik Eliasson <eliasson at it.kth.se>
- * Johan Bilien <jobi at via.ecp.fr>
-*/
-
-#ifndef MEDIA_STREAM_H
-#define MEDIA_STREAM_H
-
-#include<libminisip/libminisip_config.h>
-
-#include<libmutil/MemObject.h>
-
-#include<libminisip/rtp/CryptoContext.h>
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/mediahandler/Session.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
-#include<libminisip/rtp/SRtpPacket.h>
-
-#ifdef ZRTP_SUPPORT
-#include <libminisip/zrtp/ZrtpHostBridgeMinisip.h>
-#include <time.h>
-class ZrtpHostBridgeMinisip;
-#endif
-
-class KeyAgreement;
-class UDPSocket;
-class SdpHeaderM;
-class IpProvider;
-
-/**
- * Abstract class that implements common functions to a
- * MediaStreamSender and MediaStreamReceiver
- */
-
-class LIBMINISIP_API MediaStream : public MObject{
- public:
- /**
- * Starts the transmission or reception of a the stream.
- */
- virtual void start() = 0;
-
- /**
- * Stops the transmission or reception of a the stream.
- */
- virtual void stop() = 0;
-
-#ifdef DEBUG_OUTPUT
- virtual std::string getDebugString();
-#endif
-
- /**
- * Returns the media type corresponding to this stream
- * (video, audio...) as it appears in the session
- * description (SDP).
- * @returns the type as a string
- */
- std::string getSdpMediaType();/* audio, video, application... */
-
- /**
- * Returns additional media attributes that are to appear
- * in the session description (SDP) as a: header.
- * @returns the attributes as a list of string, each
- * of them should go into a a: header
- */
- std::list<std::string> getSdpAttributes();
-
- virtual std::string getMemObjectType(){return "MediaStream";}
- bool disabled;
-
- /**
- * Used to query the port on which the media is received for
- * a receiver, respectively where it is sent to for a sender
- * @returns the port.
- */
- virtual uint16_t getPort()=0;
-
- /**
- * Used to check a m: header in a session description
- * against the media stream for compatibility
- * @param m a reference to the object representing the m:
- * SDP header
- * @param formatIndex is the index of the CODEC
- * in the m: header against which we should compare the
- * MediaStream
- * @returns whether or not this media stream corresponds
- * to the description in the m: header.
- */
- virtual bool matches( MRef<SdpHeaderM *> m,
- uint32_t formatIndex );
-
- /**
- * Used by the media session to pass the result of
- * the key exchange performed during the session
- * initiaton.
- * @param ka a reference to the KeyAgreement object.
- */
- void setKeyAgreement( MRef<KeyAgreement *> ka );
-
- /**
- Returns an MRef to the Media object used by this media stream.
- Use with care.
- */
- MRef<Media *> getMedia() { return media; }
-#ifdef ZRTP_SUPPORT
- /**
- * Set the ZRTP implementation host brigde for this media stream.
- *
- * The ZRTP host bridge implements the Minisip specific functions
- * to connect Minisip to the ZRTP protocol / key agreement. Please
- * note that the same host bridge instance must be used for a pair
- * of sender/receiver objects that form a RTP session.
- *
- * @param zsb
- * The pointer to the host bridge object for this RTP session.
- *
- * TODO: make it a list because the receiver may have several hostbridges
- * in case of e.g. conferences.
- */
- virtual void setZrtpHostBridge(MRef<ZrtpHostBridgeMinisip *> zsb) {zrtpBridge = zsb; };
-
- /**
- * Get the ZRTP implementation host brigde for this media stream.
- *
- * @return zsb
- * The pointer to the host bridge object for this RTP session.
- */
- virtual MRef<ZrtpHostBridgeMinisip *> getZrtpHostBridge() {return zrtpBridge; };
-
- /**
- * Used by ZRTP host bridge to set the crypto context for this RTP session.
- *
- * @param cx
- * The initialized CryptoContext to use for this RTP session.
- * @param ssrc
- * The ssrc of this RTP stream (sender or receiver)
- */
- virtual void setKeyAgreementZrtp(MRef<CryptoContext *>cx);
-#endif
-
- protected:
- MRef<CryptoContext *> getCryptoContext( uint32_t ssrc, uint16_t seq_no );
- MediaStream( MRef<Media *> );
- MRef<Media *> media;
- uint32_t csbId;
-
- uint8_t localPayloadType;
-
- MRef<CryptoContext *> initCrypto( uint32_t ssrc, uint16_t seq_no );
- MRef<KeyAgreement *> ka;
- Mutex kaLock;
- std::list< MRef<CryptoContext *> > cryptoContexts;
-#ifdef ZRTP_SUPPORT
- MRef<ZrtpHostBridgeMinisip *> zrtpBridge;
-#endif
-};
-
-/**
- * The MediaStreamReceiver receives media for a given medium on a
- * given session. It is responsible for decryption and replay protection
- * in the case of SRTP.
- */
-class LIBMINISIP_API MediaStreamReceiver : public MediaStream{
- public:
- /**
- * Constructor, called by the MediaHandler when creating
- * a new media session.
- * @param media a reference to the Media object
- * that will process
- * incoming data on this receiver.
- * @param rtpReceiver a reference to the RtpReceiver object
- * to which this MediaStreamReceiver should register when
- * the session starts
- * @param ipProvider reference to the IpProvider object,
- * used to obtain contact IP address and port in NAT
- * traversal mechanism
- */
- MediaStreamReceiver( MRef<Media *> media,
- MRef<RtpReceiver *> rtpReceiver,
- MRef<IpProvider *> ipProvider );
-
-#ifdef DEBUG_OUTPUT
- virtual std::string getDebugString();
-#endif
-
- virtual std::string getMemObjectType(){return "MediaStreamReceiver";}
-
- /**
- * Starts the reception of a the stream, by subscribing to
- * the RtpReceiver.
- */
- virtual void start();
-
- /**
- * Stops the reception of a stream, by unsubscribing to
- * the RtpReceiver.
- */
- virtual void stop();
-
- /**
- * Used to query which port should be advertised as
- * the contact port in the session description.
- * @returns the port to use
- */
- virtual uint16_t getPort();
-
- /**
- * Handles incoming RTP packets, decrypts them
- * and send them to the corresponding media for
- * playback.
- * @param packet the (S)RTP packet to handle
- */
- virtual void handleRtpPacket( MRef<SRtpPacket *> packet, MRef<IPAddress *> from );
-
- /**
- * Returns a unique identifier for this Receiver. Used
- * to register or unregister receivers to RtpReceiver objects.
- * @returns the identifier
- */
- uint32_t getId();
-
- /**
- * Used to query the available CODECs for this media type,
- * during this session. Used by the Session to create
- * the session description (SDP).
- *
- * @returns a list of references to Codec objects, sorted
- * according to the user's preference, first being preferred
- */
- std::list<MRef<Codec *> > getAvailableCodecs();
-
- std::list<uint32_t> getSsrcList() {
- return ssrcList;
- }
-
-#ifdef ZRTP_SUPPORT
- /**
- * Process a received packet with an extension header
- * and unknown payload type.
- *
- * This packet has an extension header and does not
- * contain payload data to process. The method checks
- * if it is a ZRTP packet, if yes process
- * it. Otherwise just return to the caller. Because
- * the payload type is unknown the caller usually
- * dismisses the packet.
- *
- * <p/>
- *
- * This method is called only if a ZRTP host bridge is
- * enabled.
- *
- * @param packet
- * A (S)Rtp packet to process
- */
- virtual void handleRtpPacketExt(MRef<SRtpPacket *> packet);
-#endif
- protected:
- std::list<MRef<Codec *> > codecList;
- MRef<RtpReceiver *> rtpReceiver;
- uint32_t id;
- MRef<IpProvider *> ipProvider;
- uint16_t externalPort;
-
- void gotSsrc( uint32_t ssrc );
-
- std::list<uint32_t> ssrcList;
- Mutex ssrcListLock;
-
- bool running;
-
-};
-
-/**
- * The MediaStreamSender is used to send media to a specific peer, during
- * a specific media Session. It holds the CODEC instance selected for
- * this peer, and is responsible for encryption.
- */
-class LIBMINISIP_API MediaStreamSender : public MediaStream{
- public:
- /**
- * Constructor, used by the MediaHandler during the
- * creation of the media Session.
- * @param media a reference to the Media object from
- * which the MediaStreamSender is receiving data
- * @param senderSock a reference to the UDPSocket object
- * to which the data should be sent. If NULL a new one
- * is created
- */
- MediaStreamSender( MRef<Media *> media,
- MRef<UDPSocket *> senderSock=NULL );
-
-#ifdef DEBUG_OUTPUT
- virtual std::string getDebugString();
-#endif
-
- virtual std::string getMemObjectType(){return "MediaStreamSender";}
-
- /**
- * Returns the CODEC instance currently selected for
- * this peer.
- * @returns a reference to the CodecState object
- */
- MRef<CodecState *> getSelectedCodec(){return selectedCodec;};
-
- /**
- * Starts the transmission of the stream, by
- * subscribing to the Media for data.
- */
- virtual void start();
-
- /**
- * Stops the transmission, by unsubscribing to the
- * Media.
- */
- virtual void stop();
-
- /**
- * Used by the Session to set the port on which the
- * the peer is expecting to receive the data. This
- * is extracted from the received session description
- * (SDP).
- * @param port the port to which the MediaStreamSender should
- * send
- */
- virtual void setPort( uint16_t port );
-
- /**
- * Returns the port to which data is sent.
- * @retunrs the port to which the MediaStreamSender is sending
- * data, or 0 if it was not set
- */
- virtual uint16_t getPort();
-
- /**
- * Used by the Media to send data, if the MediaStreamSender
- * has subscribed to the Media. The data will be encrypted
- * if required, and encapsulated in an RTP packet.
- * @param data a pointer to the data to send
- * @param length the lenght of the data to send
- * @param ts the timestamp to use in RTP header, or
- * NULL if the MediaStreamSender should decide it
- * @param marker whether or not the marker should be set
- * in the RTP header
- * @param dtmf whether or not the data is a DTMF signal
- */
- void send( byte_t * data, uint32_t length, uint32_t * ts, bool marker = false, bool dtmf = false );
-
-#ifdef ZRTP_SUPPORT
- /**
- * Used by the ZRTP host bridge to send ZRTP data.
- *
- * This method sets up a ZRTP packet with a specific
- * payload type and sends the data to our peer. These
- * packets shall not go into normal payload processing
- * at the receiver because of the specific payload
- * type setting.
- *
- * @param data
- * The pointer to the extension header to send.
- * @param length
- * Length of the extension header in bytes.
- * @param payload
- * Pointer to the payload or NULL if no payload required
- * @param payLen
- * Length of payload in bytes
- */
- void sendZrtp(unsigned char* data, int length,
- unsigned char* payload, int payLen);
-
- /**
- * Get the current Seq number of this packet
- *
- * @return
- * The sender current sequence number.
- */
- uint16_t getSeqNo() { return seqNo; };
-#endif
-
- /**
- * Used by the Session to specify the IP address
- * on which the data should be sent to the peer. This
- * information is extracted from the received session
- * description (SDP)
- * @param remoteAddress a pointer to the IPAddress object
- * which represents the peer's contact IP address
- */
- void setRemoteAddress( MRef<IPAddress *> remoteAddress );
-
- /**
- * Used to mute or unmute this sender, resulting
- * in it sending or not sending the data it receives
- * from the Media.
- * @param mute whether or not this MediaStreamSender should
- * be muted
- */
- void setMuted( bool mute ) { muted = mute;}
-
- /**
- * Queries the muted state of this MediaStreamSender
- * @returns whether or not this MediaStreamSender is muted
- */
- bool isMuted() { return muted;}
-
- /**
- * Used to know whether or not a packet should be sent
- * even if the MediaStreamSender is muted, for the
- * Session to be kept alive.
- * @param max specifies after how many muted packets a
- * keep alive packet should be sent
- */
- bool muteKeepAlive( uint32_t max);
-
- /**
- * Used to check a m: header in a session description
- * against the media stream for compatibility. In
- * case the MediaStreamSender is compatible, the
- * CODEC is selected, if it wasn't already.
- * @param m a reference to the object representing the m:
- * SDP header
- * @param formatIndex is the index of the CODEC
- * in the m: header against which we should compare the
- * MediaStream
- * @returns whether or not this media stream corresponds
- * to the description in the m: header.
- */
- virtual bool matches( MRef<SdpHeaderM *> m,
- uint32_t formatIndex );
-
- /**
- * Used to query the SSRC identifier used in RTP headers.
- * It is created randomly upon creation of the
- * MediaStreamSender.
- * @returns the SSRC identifier used by this MediaStreamSender
- */
- uint32_t getSsrc();
-
- void increaseLastTs( ) { lastTs += 160; };
- uint32_t getLastTs() { return lastTs; };
-
- private:
- uint32_t ssrc;
- MRef<UDPSocket *> senderSock;
- uint16_t remotePort;
- uint16_t seqNo;
- uint32_t lastTs;
- MRef<IPAddress *> remoteAddress;
- Mutex senderLock;
-
- uint8_t payloadType;
- MRef<CodecState *> selectedCodec;
-
- //Cesc -- does it conflict with bool disabled???
- bool muted;
- uint32_t muteCounter;
-
-};
-
-#endif
+/*
+ Copyright (C) 2004-2006 the Minisip Team
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* Copyright (C) 2004, 2005
+ *
+ * Authors: Erik Eliasson <eliasson at it.kth.se>
+ * Johan Bilien <jobi at via.ecp.fr>
+*/
+
+#ifndef MEDIA_STREAM_H
+#define MEDIA_STREAM_H
+
+#include<libminisip/libminisip_config.h>
+
+#include<libmutil/MemObject.h>
+
+#include<libminisip/rtp/CryptoContext.h>
+#include<libminisip/mediahandler/Media.h>
+#include<libminisip/mediahandler/Session.h>
+#include<libminisip/mediahandler/RtpReceiver.h>
+#include<libminisip/rtp/SRtpPacket.h>
+
+#ifdef ZRTP_SUPPORT
+#include <libminisip/zrtp/ZrtpHostBridgeMinisip.h>
+#include <time.h>
+class ZrtpHostBridgeMinisip;
+#endif
+
+class KeyAgreement;
+class UDPSocket;
+class SdpHeaderM;
+class IpProvider;
+
+/**
+ * Abstract class that implements common functions to a
+ * MediaStreamSender and MediaStreamReceiver
+ */
+
+class LIBMINISIP_API MediaStream : public MObject{
+ public:
+ /**
+ * Starts the transmission or reception of a the stream.
+ */
+ virtual void start() = 0;
+
+ /**
+ * Stops the transmission or reception of a the stream.
+ */
+ virtual void stop() = 0;
+
+#ifdef DEBUG_OUTPUT
+ virtual std::string getDebugString();
+#endif
+
+ /**
+ * Returns the media type corresponding to this stream
+ * (video, audio...) as it appears in the session
+ * description (SDP).
+ * @returns the type as a string
+ */
+ std::string getSdpMediaType();/* audio, video, application... */
+
+ /**
+ * Returns additional media attributes that are to appear
+ * in the session description (SDP) as a: header.
+ * @returns the attributes as a list of string, each
+ * of them should go into a a: header
+ */
+ std::list<std::string> getSdpAttributes();
+
+ virtual std::string getMemObjectType(){return "MediaStream";}
+ bool disabled;
+
+ /**
+ * Used to query the port on which the media is received for
+ * a receiver, respectively where it is sent to for a sender
+ * @returns the port.
+ */
+ virtual uint16_t getPort()=0;
+
+ /**
+ * Used to check a m: header in a session description
+ * against the media stream for compatibility
+ * @param m a reference to the object representing the m:
+ * SDP header
+ * @param formatIndex is the index of the CODEC
+ * in the m: header against which we should compare the
+ * MediaStream
+ * @returns whether or not this media stream corresponds
+ * to the description in the m: header.
+ */
+ virtual bool matches( MRef<SdpHeaderM *> m,
+ uint32_t formatIndex );
+
+ /**
+ * Used by the media session to pass the result of
+ * the key exchange performed during the session
+ * initiaton.
+ * @param ka a reference to the KeyAgreement object.
+ */
+ void setKeyAgreement( MRef<KeyAgreement *> ka );
+
+ /**
+ Returns an MRef to the Media object used by this media stream.
+ Use with care.
+ */
+ MRef<Media *> getMedia() { return media; }
+#ifdef ZRTP_SUPPORT
+ /**
+ * Set the ZRTP implementation host brigde for this media stream.
+ *
+ * The ZRTP host bridge implements the Minisip specific functions
+ * to connect Minisip to the ZRTP protocol / key agreement. Please
+ * note that the same host bridge instance must be used for a pair
+ * of sender/receiver objects that form a RTP session.
+ *
+ * @param zsb
+ * The pointer to the host bridge object for this RTP session.
+ *
+ * TODO: make it a list because the receiver may have several hostbridges
+ * in case of e.g. conferences.
+ */
+ virtual void setZrtpHostBridge(MRef<ZrtpHostBridgeMinisip *> zsb) {zrtpBridge = zsb; };
+
+ /**
+ * Get the ZRTP implementation host brigde for this media stream.
+ *
+ * @return zsb
+ * The pointer to the host bridge object for this RTP session.
+ */
+ virtual MRef<ZrtpHostBridgeMinisip *> getZrtpHostBridge() {return zrtpBridge; };
+
+ /**
+ * Used by ZRTP host bridge to set the crypto context for this RTP session.
+ *
+ * @param cx
+ * The initialized CryptoContext to use for this RTP session.
+ * @param ssrc
+ * The ssrc of this RTP stream (sender or receiver)
+ */
+ virtual void setKeyAgreementZrtp(MRef<CryptoContext *>cx);
+#endif
+
+ protected:
+ MRef<CryptoContext *> getCryptoContext( uint32_t ssrc, uint16_t seq_no );
+ MediaStream( MRef<Media *> );
+ MRef<Media *> media;
+ uint32_t csbId;
+
+ uint8_t localPayloadType;
+
+ MRef<CryptoContext *> initCrypto( uint32_t ssrc, uint16_t seq_no );
+ MRef<KeyAgreement *> ka;
+ Mutex kaLock;
+ std::list< MRef<CryptoContext *> > cryptoContexts;
+#ifdef ZRTP_SUPPORT
+ MRef<ZrtpHostBridgeMinisip *> zrtpBridge;
+#endif
+};
+
+/**
+ * The MediaStreamReceiver receives media for a given medium on a
+ * given session. It is responsible for decryption and replay protection
+ * in the case of SRTP.
+ */
+class LIBMINISIP_API MediaStreamReceiver : public MediaStream{
+ public:
+ /**
+ * Constructor, called by the MediaHandler when creating
+ * a new media session.
+ * @param media a reference to the Media object
+ * that will process
+ * incoming data on this receiver.
+ * @param rtpReceiver a reference to the RtpReceiver object
+ * to which this MediaStreamReceiver should register when
+ * the session starts
+ * @param ipProvider reference to the IpProvider object,
+ * used to obtain contact IP address and port in NAT
+ * traversal mechanism
+ */
+ MediaStreamReceiver( MRef<Media *> media,
+ MRef<RtpReceiver *> rtpReceiver,
+ MRef<IpProvider *> ipProvider );
+
+#ifdef DEBUG_OUTPUT
+ virtual std::string getDebugString();
+#endif
+
+ virtual std::string getMemObjectType(){return "MediaStreamReceiver";}
+
+ /**
+ * Starts the reception of a the stream, by subscribing to
+ * the RtpReceiver.
+ */
+ virtual void start();
+
+ /**
+ * Stops the reception of a stream, by unsubscribing to
+ * the RtpReceiver.
+ */
+ virtual void stop();
+
+ /**
+ * Used to query which port should be advertised as
+ * the contact port in the session description.
+ * @returns the port to use
+ */
+ virtual uint16_t getPort();
+
+ /**
+ * Handles incoming RTP packets, decrypts them
+ * and send them to the corresponding media for
+ * playback.
+ * @param packet the (S)RTP packet to handle
+ */
+ virtual void handleRtpPacket( MRef<SRtpPacket *> packet, MRef<IPAddress *> from );
+
+ /**
+ * Returns a unique identifier for this Receiver. Used
+ * to register or unregister receivers to RtpReceiver objects.
+ * @returns the identifier
+ */
+ uint32_t getId();
+
+ /**
+ * Used to query the available CODECs for this media type,
+ * during this session. Used by the Session to create
+ * the session description (SDP).
+ *
+ * @returns a list of references to Codec objects, sorted
+ * according to the user's preference, first being preferred
+ */
+ std::list<MRef<Codec *> > getAvailableCodecs();
+
+ std::list<uint32_t> getSsrcList() {
+ return ssrcList;
+ }
+
+#ifdef ZRTP_SUPPORT
+ /**
+ * Process a received packet with an extension header
+ * and unknown payload type.
+ *
+ * This packet has an extension header and does not
+ * contain payload data to process. The method checks
+ * if it is a ZRTP packet, if yes process
+ * it. Otherwise just return to the caller. Because
+ * the payload type is unknown the caller usually
+ * dismisses the packet.
+ *
+ * <p/>
+ *
+ * This method is called only if a ZRTP host bridge is
+ * enabled.
+ *
+ * @param packet
+ * A (S)Rtp packet to process
+ */
+ virtual void handleRtpPacketExt(MRef<SRtpPacket *> packet);
+#endif
+ protected:
+ std::list<MRef<Codec *> > codecList;
+ MRef<RtpReceiver *> rtpReceiver;
+ uint32_t id;
+ MRef<IpProvider *> ipProvider;
+ uint16_t externalPort;
+
+ void gotSsrc( uint32_t ssrc );
+
+ std::list<uint32_t> ssrcList;
+ Mutex ssrcListLock;
+
+ bool running;
+
+};
+
+/**
+ * The MediaStreamSender is used to send media to a specific peer, during
+ * a specific media Session. It holds the CODEC instance selected for
+ * this peer, and is responsible for encryption.
+ */
+class LIBMINISIP_API MediaStreamSender : public MediaStream{
+ public:
+ /**
+ * Constructor, used by the MediaHandler during the
+ * creation of the media Session.
+ * @param media a reference to the Media object from
+ * which the MediaStreamSender is receiving data
+ * @param senderSock a reference to the UDPSocket object
+ * to which the data should be sent. If NULL a new one
+ * is created
+ */
+ MediaStreamSender( MRef<Media *> media,
+ MRef<UDPSocket *> senderSock=NULL );
+
+#ifdef DEBUG_OUTPUT
+ virtual std::string getDebugString();
+#endif
+
+ virtual std::string getMemObjectType(){return "MediaStreamSender";}
+
+ /**
+ * Returns the CODEC instance currently selected for
+ * this peer.
+ * @returns a reference to the CodecState object
+ */
+ MRef<CodecState *> getSelectedCodec(){return selectedCodec;};
+
+ /**
+ * Starts the transmission of the stream, by
+ * subscribing to the Media for data.
+ */
+ virtual void start();
+
+ /**
+ * Stops the transmission, by unsubscribing to the
+ * Media.
+ */
+ virtual void stop();
+
+ /**
+ * Used by the Session to set the port on which the
+ * the peer is expecting to receive the data. This
+ * is extracted from the received session description
+ * (SDP).
+ * @param port the port to which the MediaStreamSender should
+ * send
+ */
+ virtual void setPort( uint16_t port );
+
+ /**
+ * Returns the port to which data is sent.
+ * @retunrs the port to which the MediaStreamSender is sending
+ * data, or 0 if it was not set
+ */
+ virtual uint16_t getPort();
+
+ /**
+ * Used by the Media to send data, if the MediaStreamSender
+ * has subscribed to the Media. The data will be encrypted
+ * if required, and encapsulated in an RTP packet.
+ * @param data a pointer to the data to send
+ * @param length the lenght of the data to send
+ * @param ts the timestamp to use in RTP header, or
+ * NULL if the MediaStreamSender should decide it
+ * @param marker whether or not the marker should be set
+ * in the RTP header
+ * @param dtmf whether or not the data is a DTMF signal
+ */
+ void send( byte_t * data, uint32_t length, uint32_t * ts, bool marker = false, bool dtmf = false );
+
+#ifdef ZRTP_SUPPORT
+ /**
+ * Used by the ZRTP host bridge to send ZRTP data.
+ *
+ * This method sets up a ZRTP packet with a specific
+ * payload type and sends the data to our peer. These
+ * packets shall not go into normal payload processing
+ * at the receiver because of the specific payload
+ * type setting.
+ *
+ * @param data
+ * The pointer to the extension header to send.
+ * @param length
+ * Length of the extension header in bytes.
+ * @param payload
+ * Pointer to the payload or NULL if no payload required
+ * @param payLen
+ * Length of payload in bytes
+ */
+ void sendZrtp(unsigned char* data, int length,
+ unsigned char* payload, int payLen);
+
+ /**
+ * Get the current Seq number of this packet
+ *
+ * @return
+ * The sender current sequence number.
+ */
+ uint16_t getSeqNo() { return seqNo; };
+#endif
+
+ /**
+ * Used by the Session to specify the IP address
+ * on which the data should be sent to the peer. This
+ * information is extracted from the received session
+ * description (SDP)
+ * @param remoteAddress a pointer to the IPAddress object
+ * which represents the peer's contact IP address
+ */
+ void setRemoteAddress( MRef<IPAddress *> remoteAddress );
+
+ /**
+ * Used to mute or unmute this sender, resulting
+ * in it sending or not sending the data it receives
+ * from the Media.
+ * @param mute whether or not this MediaStreamSender should
+ * be muted
+ */
+ void setMuted( bool mute ) { muted = mute;}
+
+ /**
+ * Queries the muted state of this MediaStreamSender
+ * @returns whether or not this MediaStreamSender is muted
+ */
+ bool isMuted() { return muted;}
+
+ /**
+ * Used to know whether or not a packet should be sent
+ * even if the MediaStreamSender is muted, for the
+ * Session to be kept alive.
+ * @param max specifies after how many muted packets a
+ * keep alive packet should be sent
+ */
+ bool muteKeepAlive( uint32_t max);
+
+ /**
+ * Used to check a m: header in a session description
+ * against the media stream for compatibility. In
+ * case the MediaStreamSender is compatible, the
+ * CODEC is selected, if it wasn't already.
+ * @param m a reference to the object representing the m:
+ * SDP header
+ * @param formatIndex is the index of the CODEC
+ * in the m: header against which we should compare the
+ * MediaStream
+ * @returns whether or not this media stream corresponds
+ * to the description in the m: header.
+ */
+ virtual bool matches( MRef<SdpHeaderM *> m,
+ uint32_t formatIndex );
+
+ /**
+ * Used to query the SSRC identifier used in RTP headers.
+ * It is created randomly upon creation of the
+ * MediaStreamSender.
+ * @returns the SSRC identifier used by this MediaStreamSender
+ */
+ uint32_t getSsrc();
+
+ void increaseLastTs( ) { lastTs += 160; };
+ uint32_t getLastTs() { return lastTs; };
+
+ private:
+ uint32_t ssrc;
+ MRef<UDPSocket *> senderSock;
+ uint16_t remotePort;
+ uint16_t seqNo;
+ uint32_t lastTs;
+ MRef<IPAddress *> remoteAddress;
+ Mutex senderLock;
+
+ uint8_t payloadType;
+ MRef<CodecState *> selectedCodec;
+
+ //Cesc -- does it conflict with bool disabled???
+ bool muted;
+ uint32_t muteCounter;
+
+};
+
+#endif
Property changes on: trunk/libminisip/include/libminisip/mediahandler/MediaStream.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/RtpReceiver.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/Session.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/mediahandler/SessionRegistry.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/GroupList.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/GroupListClient.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/GroupListServer.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/GroupListUserElement.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/P2T.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpAPP.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpAPPHeader.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpReceiver.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpSender.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpTransactionGetFloor.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpTransactionGrantFloor.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpTransactionIdleFloor.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpTransactionReleaseFloor.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/RtcpTransactionTakenFloor.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/SipDialogP2T.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/p2t/SipDialogP2Tuser.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/CryptoContext.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpDebugMonitor.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpPacket.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpReport.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpReportRR.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpReportReceptionBlock.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpReportSDES.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpReportSR.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpReportSenderInfo.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/RtcpReportXR.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libminisip/include/libminisip/rtp/RtpHeader.h
===================================================================
--- trunk/libminisip/include/libminisip/rtp/RtpHeader.h 2006-06-04 10:27:21 UTC (rev 2614)
+++ trunk/libminisip/include/libminisip/rtp/RtpHeader.h 2006-06-04 10:36:05 UTC (rev 2615)
@@ -1,89 +1,89 @@
-/*
- Copyright (C) 2004-2006 the Minisip Team
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* Copyright (C) 2004
- *
- * Authors: Erik Eliasson <eliasson at it.kth.se>
- * Johan Bilien <jobi at via.ecp.fr>
-*/
-
-#ifndef RTPHEADER_H
-#define RTPHEADER_H
-
-#include<libminisip/libminisip_config.h>
-
-#include<vector>
-
-class LIBMINISIP_API RtpHeader{
-
- public:
- RtpHeader();
- void setVersion(int v);
- void setExtension(int x);
- int getExtension();
- void setCSRCCount(int cc);
- void setMarker(int m);
- bool getMarker();
- void setPayloadType(int pt);
- int getPayloadType();
- void setSeqNo(uint16_t seq_no);
- uint16_t getSeqNo();
- void setTimestamp(uint32_t timestamp);
- uint32_t getTimestamp();
- void setSSRC(uint32_t ssrc);
- uint32_t getSSRC();
- void addCSRC(int csrc);
-
-#ifdef TCP_FRIENDLY
- void setRttEstimate(uint32_t rtt){tcpFriendlyMode=true; rttestimate=rtt;}
- uint32_t getRttEstimate(){return rttestimate;}
-
- void setSendingTimestamp(uint32_t ts){tcpFriendlyMode=true; sending_timestamp=ts;}
- uint32_t getSendingTimestamp(){return sending_timestamp;}
-#endif
-
-#ifdef DEBUG_OUTPUT
- void printDebug();
-#endif
-
- int size();
- char *getBytes();
-
- int CSRC_count;
- int version;
- int extension;
- int marker;
- int payload_type;
- uint16_t sequence_number;
- uint32_t timestamp;
- uint32_t SSRC;
- std::vector<int> CSRC;
-
- private:
-#ifdef TCP_FRIENDLY
- //code to support the variable bandwidth experiments in the
- //thesis by David Tlahuetl
- bool tcpFriendlyMode;
- uint32_t sending_timestamp;
- uint32_t rttestimate;
-#endif
-
-};
-
-#endif
-
+/*
+ Copyright (C) 2004-2006 the Minisip Team
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* Copyright (C) 2004
+ *
+ * Authors: Erik Eliasson <eliasson at it.kth.se>
+ * Johan Bilien <jobi at via.ecp.fr>
+*/
+
+#ifndef RTPHEADER_H
+#define RTPHEADER_H
+
+#include<libminisip/libminisip_config.h>
+
+#include<vector>
+
+class LIBMINISIP_API RtpHeader{
+
+ public:
+ RtpHeader();
+ void setVersion(int v);
+ void setExtension(int x);
+ int getExtension();
+ void setCSRCCount(int cc);
+ void setMarker(int m);
+ bool getMarker();
+ void setPayloadType(int pt);
+ int getPayloadType();
+ void setSeqNo(uint16_t seq_no);
+ uint16_t getSeqNo();
+ void setTimestamp(uint32_t timestamp);
+ uint32_t getTimestamp();
+ void setSSRC(uint32_t ssrc);
+ uint32_t getSSRC();
+ void addCSRC(int csrc);
+
+#ifdef TCP_FRIENDLY
+ void setRttEstimate(uint32_t rtt){tcpFriendlyMode=true; rttestimate=rtt;}
+ uint32_t getRttEstimate(){return rttestimate;}
+
+ void setSendingTimestamp(uint32_t ts){tcpFriendlyMode=true; sending_timestamp=ts;}
+ uint32_t getSendingTimestamp(){return sending_timestamp;}
+#endif
+
+#ifdef DEBUG_OUTPUT
+ void printDebug();
+#endif
+
+ int size();
+ char *getBytes();
+
+ int CSRC_count;
+ int version;
+ int extension;
+ int marker;
+ int payload_type;
+ uint16_t sequence_number;
+ uint32_t timestamp;
+ uint32_t SSRC;
+ std::vector<int> CSRC;
+
+ private:
+#ifdef TCP_FRIENDLY
+ //code to support the variable bandwidth experiments in the
+ //thesis by David Tlahuetl
+ bool tcpFriendlyMode;
+ uint32_t sending_timestamp;
+ uint32_t rttestimate;
+#endif
+
+};
+
+#endif
+
Property changes on: trunk/libminisip/include/libminisip/rtp/RtpHeader.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libminisip/include/libminisip/rtp/RtpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/rtp/RtpPacket.h 2006-06-04 10:27:21 UTC (rev 2614)
+++ trunk/libminisip/include/libminisip/rtp/RtpPacket.h 2006-06-04 10:36:05 UTC (rev 2615)
@@ -1,114 +1,114 @@
-/*
- Copyright (C) 2004-2006 the Minisip Team
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* Copyright (C) 2004
- *
- * Authors: Erik Eliasson <eliasson at it.kth.se>
- * Johan Bilien <jobi at via.ecp.fr>
-*/
-
-#ifndef RTPPACKET_H
-#define RTPPACKET_H
-
-#include<libminisip/libminisip_config.h>
-
-#include<libmutil/MemObject.h>
-
-#include<libmnetutil/UDPSocket.h>
-#include<libmnetutil/IPAddress.h>
-
-#include<libminisip/rtp/RtpHeader.h>
-
-/**
- * This class implements the RTP header.
- *
- * As a specific feature the RTP packet class handles the extension
- * header feature of RTP. This is because the extension header is not
- * standard RTP header but contains more application related data.
- *
- */
-
-class LIBMINISIP_API RtpPacket: public MObject {
- public:
- RtpPacket();
- RtpPacket(unsigned char *content, int content_length, int seq_no, unsigned timestamp, unsigned ssrc);
- RtpPacket(RtpHeader hdr, unsigned char *content, int content_length);
- virtual ~RtpPacket();
-
- static RtpPacket *readPacket(UDPSocket &udp_sock, int timeout=-1);
-
- void sendTo(UDPSocket &udp_sock, IPAddress &to_addr, int port);
-
- RtpHeader &getHeader();
-
- unsigned char *getContent();
- int getContentLength();
-#ifdef ZRTP_SUPPORT
- /**
- * Get length of extension header in bytes (not in words).
- *
- * @return
- * Length in bytes of extension header
- */
- int getExtensionLength() { return extensionLength; };
-
- /*
- * Get pointer to extension header data.
- *
- * The pointer is returned as unsigned char because the extension
- * header data structure is application dependend.
- *
- * @return
- * Returns the pointer to the extension header
- */
- unsigned char* getExtensionHeader() { return extensionHeader; };
-
- /*
- * Set extension header for this RTP packet.
- *
- * This method prepends the extension header to data thay may already
- * exist in this packet. The method updates the overall data content
- * as well as the lentgh. Als the extension header flag is set.
- *
- * @param data
- * Pointer to extensione header data.
- * @param length
- * Length of extension header data in bytes.
- */
- void setExtHeader(unsigned char* data, int length);
-#endif // ZRTP_SUPPORT
-
-#ifdef DEBUG_OUTPUT
- void printDebug();
-#endif
-
- virtual char *getBytes();
- virtual int size();
-
- protected:
-
- RtpHeader header;
- int content_length;
- unsigned char *content;
-#ifdef ZRTP_SUPPORT
- int extensionLength;
- unsigned char* extensionHeader;
-#endif
-};
-
-#endif
+/*
+ Copyright (C) 2004-2006 the Minisip Team
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* Copyright (C) 2004
+ *
+ * Authors: Erik Eliasson <eliasson at it.kth.se>
+ * Johan Bilien <jobi at via.ecp.fr>
+*/
+
+#ifndef RTPPACKET_H
+#define RTPPACKET_H
+
+#include<libminisip/libminisip_config.h>
+
+#include<libmutil/MemObject.h>
+
+#include<libmnetutil/UDPSocket.h>
+#include<libmnetutil/IPAddress.h>
+
+#include<libminisip/rtp/RtpHeader.h>
+
+/**
+ * This class implements the RTP header.
+ *
+ * As a specific feature the RTP packet class handles the extension
+ * header feature of RTP. This is because the extension header is not
+ * standard RTP header but contains more application related data.
+ *
+ */
+
+class LIBMINISIP_API RtpPacket: public MObject {
+ public:
+ RtpPacket();
+ RtpPacket(unsigned char *content, int content_length, int seq_no, unsigned timestamp, unsigned ssrc);
+ RtpPacket(RtpHeader hdr, unsigned char *content, int content_length);
+ virtual ~RtpPacket();
+
+ static RtpPacket *readPacket(UDPSocket &udp_sock, int timeout=-1);
+
+ void sendTo(UDPSocket &udp_sock, IPAddress &to_addr, int port);
+
+ RtpHeader &getHeader();
+
+ unsigned char *getContent();
+ int getContentLength();
+#ifdef ZRTP_SUPPORT
+ /**
+ * Get length of extension header in bytes (not in words).
+ *
+ * @return
+ * Length in bytes of extension header
+ */
+ int getExtensionLength() { return extensionLength; };
+
+ /*
+ * Get pointer to extension header data.
+ *
+ * The pointer is returned as unsigned char because the extension
+ * header data structure is application dependend.
+ *
+ * @return
+ * Returns the pointer to the extension header
+ */
+ unsigned char* getExtensionHeader() { return extensionHeader; };
+
+ /*
+ * Set extension header for this RTP packet.
+ *
+ * This method prepends the extension header to data thay may already
+ * exist in this packet. The method updates the overall data content
+ * as well as the lentgh. Als the extension header flag is set.
+ *
+ * @param data
+ * Pointer to extensione header data.
+ * @param length
+ * Length of extension header data in bytes.
+ */
+ void setExtHeader(unsigned char* data, int length);
+#endif // ZRTP_SUPPORT
+
+#ifdef DEBUG_OUTPUT
+ void printDebug();
+#endif
+
+ virtual char *getBytes();
+ virtual int size();
+
+ protected:
+
+ RtpHeader header;
+ int content_length;
+ unsigned char *content;
+#ifdef ZRTP_SUPPORT
+ int extensionLength;
+ unsigned char* extensionHeader;
+#endif
+};
+
+#endif
Property changes on: trunk/libminisip/include/libminisip/rtp/RtpPacket.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDESChunk.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDESItem.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDES_CNAME.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDES_EMAIL.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDES_LOC.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDES_NAME.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDES_NOTE.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDES_PHONE.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/SDES_TOOL.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libminisip/include/libminisip/rtp/SRtpPacket.h
===================================================================
--- trunk/libminisip/include/libminisip/rtp/SRtpPacket.h 2006-06-04 10:27:21 UTC (rev 2614)
+++ trunk/libminisip/include/libminisip/rtp/SRtpPacket.h 2006-06-04 10:36:05 UTC (rev 2615)
@@ -1,78 +1,78 @@
-/*
- Copyright (C) 2004-2006 the Minisip Team
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* Copyright (C) 2004
- *
- * Authors: Israel Abad <i_abad at terra.es>
- * Erik Eliasson <eliasson at it.kth.se>
- * Johan Bilien <jobi at via.ecp.fr>
-*/
-#ifndef SRTPPACKET_H
-#define SRTPPACKET_H
-
-#include<libminisip/libminisip_config.h>
-
-#include<libmnetutil/UDPSocket.h>
-#include<libmnetutil/IPAddress.h>
-
-#include<libminisip/rtp/CryptoContext.h>
-#include<libminisip/rtp/RtpPacket.h>
-
-RtpPacket * readRtpPacket( MRef<CryptoContext *>, UDPSocket * socket );
-
-class LIBMINISIP_API SRtpPacket : public RtpPacket{
- public:
- SRtpPacket();
- SRtpPacket(CryptoContext *scontext, RtpPacket *rtppacket);
- SRtpPacket(RtpHeader hdr,
- unsigned char *content,
- int content_length,
- unsigned char *tag,
- int tag_length,
- unsigned char *mki,
- int mki_length);
- SRtpPacket( unsigned char *content, int content_length,
- int seq_no, unsigned timestamp,
- unsigned ssrc);
- virtual ~SRtpPacket();
-
- static SRtpPacket *readPacket( UDPSocket &udp_sock, MRef<IPAddress *>&from, int timeout=-1);
- // static????
-
- void protect( MRef<CryptoContext *> scontext );
- int unprotect( MRef<CryptoContext *> scontext );
-
- unsigned char *get_tag();
- unsigned int get_tag_length();
- void remove_tag();
- void set_tag(unsigned char *tag);
-
- virtual char * getBytes();
- virtual int size();
-
-
- private:
- bool encrypted;
- unsigned char *tag;
- unsigned int tag_length;
- unsigned char * mki;
- unsigned int mki_length;
-};
-
-
-#endif
+/*
+ Copyright (C) 2004-2006 the Minisip Team
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* Copyright (C) 2004
+ *
+ * Authors: Israel Abad <i_abad at terra.es>
+ * Erik Eliasson <eliasson at it.kth.se>
+ * Johan Bilien <jobi at via.ecp.fr>
+*/
+#ifndef SRTPPACKET_H
+#define SRTPPACKET_H
+
+#include<libminisip/libminisip_config.h>
+
+#include<libmnetutil/UDPSocket.h>
+#include<libmnetutil/IPAddress.h>
+
+#include<libminisip/rtp/CryptoContext.h>
+#include<libminisip/rtp/RtpPacket.h>
+
+RtpPacket * readRtpPacket( MRef<CryptoContext *>, UDPSocket * socket );
+
+class LIBMINISIP_API SRtpPacket : public RtpPacket{
+ public:
+ SRtpPacket();
+ SRtpPacket(CryptoContext *scontext, RtpPacket *rtppacket);
+ SRtpPacket(RtpHeader hdr,
+ unsigned char *content,
+ int content_length,
+ unsigned char *tag,
+ int tag_length,
+ unsigned char *mki,
+ int mki_length);
+ SRtpPacket( unsigned char *content, int content_length,
+ int seq_no, unsigned timestamp,
+ unsigned ssrc);
+ virtual ~SRtpPacket();
+
+ static SRtpPacket *readPacket( UDPSocket &udp_sock, MRef<IPAddress *>&from, int timeout=-1);
+ // static????
+
+ void protect( MRef<CryptoContext *> scontext );
+ int unprotect( MRef<CryptoContext *> scontext );
+
+ unsigned char *get_tag();
+ unsigned int get_tag_length();
+ void remove_tag();
+ void set_tag(unsigned char *tag);
+
+ virtual char * getBytes();
+ virtual int size();
+
+
+ private:
+ bool encrypted;
+ unsigned char *tag;
+ unsigned int tag_length;
+ unsigned char * mki;
+ unsigned int mki_length;
+};
+
+
+#endif
Property changes on: trunk/libminisip/include/libminisip/rtp/SRtpPacket.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/XRReportBlock.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/rtp/XRVoIPReportBlock.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeader.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeaderA.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeaderC.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeaderM.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeaderO.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeaderS.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeaderT.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpHeaderV.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sdp/SdpPacket.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/DefaultDialogHandler.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/PresenceMessageContent.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/Sip.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogConfVoip.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogPresenceClient.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogPresenceServer.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogSecurityConfig.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogVoip.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogVoipClient.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogVoipServer.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipDialogVoipServer100rel.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/sip/SipSoftPhoneConfiguration.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/AudioMixer.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/AudioMixerSimple.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/AudioMixerSpatial.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/FileSoundDevice.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/FileSoundSource.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/OssSoundDevice.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/Resampler.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SilenceSensor.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SoundDevice.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SoundDriver.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SoundDriverRegistry.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SoundIO.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SoundIOPLCInterface.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SoundRecorderCallback.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/soundcard/SoundSource.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libminisip/include/libminisip/soundcard/WaveSoundDevice.h
===================================================================
--- trunk/libminisip/include/libminisip/soundcard/WaveSoundDevice.h 2006-06-04 10:27:21 UTC (rev 2614)
+++ trunk/libminisip/include/libminisip/soundcard/WaveSoundDevice.h 2006-06-04 10:36:05 UTC (rev 2615)
@@ -1,76 +1,76 @@
-#ifndef WAVE_SOUND_DEVICE_MSIP_H
-#define WAVE_SOUND_DEVICE_MSIP_H
-
-#include<libminisip/libminisip_config.h>
-
-#include <windows.h>
-#include <commctrl.h>
-#include <iostream>
-#include <mmsystem.h>
-#include<libminisip/soundcard/SoundDevice.h>
-#include<libminisip/soundcard/SoundDevice.h>
-
-class LIBMINISIP_API WaveSoundDevice:public SoundDevice{
-
- public:
- virtual ~WaveSoundDevice( );
- WaveSoundDevice( std::string device );
-
- virtual int readFromDevice( byte_t * buffer, uint32_t nSamples );
- virtual int writeToDevice( byte_t * buffer, uint32_t nSamples );
-
- //virtual int readError( int errcode, byte_t * buffer, uint32_t nSamples );
- //virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
-
- virtual int openPlayback( int32_t samplingRate, int nChannels, int format );
- virtual int openRecord( int32_t samplingRate, int nChannels, int format );
-
- virtual int closePlayback();
- virtual int closeRecord();
-
- virtual int readError( int errcode, byte_t * buffer, uint32_t nSamples );
- virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
-
- void playBack();
-
- virtual void sync();
-
- virtual std::string getMemObjectType(){ return "OssSoundDevice";};
-
-// HWND getWindow(){return hWnd;};
-
- //already provided by the parrent class > soundDevice
- int getSampleSize(){return 2;}
- int getNChannelsPlay(){ return 1; };
- int getNChannelsRecord(){ return 1; };
-
-
- private:
-
-
- /* WAVEFORMATEX structure for reading in the WAVE fmt chunk */
- //bool openedPlayBack;
- //bool openedRecord;
-//window
-// HWND hWnd;
-};
-
-
-void playback();
-void freeBlocks(WAVEHDR* blockArray);
-void CALLBACK waveOutProc(HWAVEOUT hWaveOut,
- UINT uMsg,
- DWORD dwInstance,
- DWORD dwParam1,
- DWORD dwParam2 );
-
-
-/*
-long QueueWaveData(WAVEHDR * waveHeader);
-int stopRecord();
-int setOutputFormat();
-int prepareOutputBuffers();
-DWORD WINAPI waveInProc(LPVOID arg);
-void CALLBACK WaveOutProc(HWAVEOUT waveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2);
-*/
+#ifndef WAVE_SOUND_DEVICE_MSIP_H
+#define WAVE_SOUND_DEVICE_MSIP_H
+
+#include<libminisip/libminisip_config.h>
+
+#include <windows.h>
+#include <commctrl.h>
+#include <iostream>
+#include <mmsystem.h>
+#include<libminisip/soundcard/SoundDevice.h>
+#include<libminisip/soundcard/SoundDevice.h>
+
+class LIBMINISIP_API WaveSoundDevice:public SoundDevice{
+
+ public:
+ virtual ~WaveSoundDevice( );
+ WaveSoundDevice( std::string device );
+
+ virtual int readFromDevice( byte_t * buffer, uint32_t nSamples );
+ virtual int writeToDevice( byte_t * buffer, uint32_t nSamples );
+
+ //virtual int readError( int errcode, byte_t * buffer, uint32_t nSamples );
+ //virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
+
+ virtual int openPlayback( int32_t samplingRate, int nChannels, int format );
+ virtual int openRecord( int32_t samplingRate, int nChannels, int format );
+
+ virtual int closePlayback();
+ virtual int closeRecord();
+
+ virtual int readError( int errcode, byte_t * buffer, uint32_t nSamples );
+ virtual int writeError( int errcode, byte_t * buffer, uint32_t nSamples );
+
+ void playBack();
+
+ virtual void sync();
+
+ virtual std::string getMemObjectType(){ return "OssSoundDevice";};
+
+// HWND getWindow(){return hWnd;};
+
+ //already provided by the parrent class > soundDevice
+ int getSampleSize(){return 2;}
+ int getNChannelsPlay(){ return 1; };
+ int getNChannelsRecord(){ return 1; };
+
+
+ private:
+
+
+ /* WAVEFORMATEX structure for reading in the WAVE fmt chunk */
+ //bool openedPlayBack;
+ //bool openedRecord;
+//window
+// HWND hWnd;
+};
+
+
+void playback();
+void freeBlocks(WAVEHDR* blockArray);
+void CALLBACK waveOutProc(HWAVEOUT hWaveOut,
+ UINT uMsg,
+ DWORD dwInstance,
+ DWORD dwParam1,
+ DWORD dwParam2 );
+
+
+/*
+long QueueWaveData(WAVEHDR * waveHeader);
+int stopRecord();
+int setOutputFormat();
+int prepareOutputBuffers();
+DWORD WINAPI waveInProc(LPVOID arg);
+void CALLBACK WaveOutProc(HWAVEOUT waveOut, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2);
+*/
#endif
\ No newline at end of file
Property changes on: trunk/libminisip/include/libminisip/soundcard/WaveSoundDevice.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/spaudio/SpAudio.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/ImageHandler.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/VideoException.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/VideoMedia.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/codec/AVCoder.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/codec/AVDecoder.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/codec/VideoCodec.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/codec/VideoEncoderCallback.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/display/VideoDisplay.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/grabber/Grabber.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/video/mixer/ImageMixer.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZIDFile.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZIDRecord.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZRtp.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpCallback.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpHostBridgeMinisip.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketBase.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketCommit.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketConf2Ack.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketConfirm.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketDHPart.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketError.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketHello.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpPacketHelloAck.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpStateClass.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpStates.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/ZrtpTextData.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/libminisip/zrtp/zrtpPacket.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/include/minisip_wce_extra_includes.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/libminisip.pc.in
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/libminisip.spec
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/m4/Makefile.am
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/m4/libminisip.m4
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/Minisip.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/aec/aec.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/aec/aec_test.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/aec/aecfix.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/aec/soundmode
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/Codec.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/G711CODEC.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/G711CODEC.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/GsmCodec.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/GsmCodec.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/SPEEXCODEC.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/SPEEXCODEC.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/g711/codec_g711.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/codecs/g711/codec_g711.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/conference/ConfCallback.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/conference/ConfMessageRouter.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/conference/ConferenceControl.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/conference/doc++.conf
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/configbackend/ConfBackend.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/configbackend/GConfBackend.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/configbackend/GConfBackend.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/configbackend/MXmlConfBackend.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/configbackend/MXmlConfBackend.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/configbackend/UserConfigPosix.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/configbackend/UserConfigWin32.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/contactdb/ContactDb.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/contactdb/MXmlPhoneBookIo.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/contactdb/PhoneBook.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/gui/Bell.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/gui/ConsoleDebugger.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/gui/Gui.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/gui/LogEntry.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/ipprovider/IpProvider.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/ipprovider/SimpleIp6Provider.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/ipprovider/SimpleIp6Provider.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/ipprovider/SimpleIpProvider.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/ipprovider/StunIpProvider.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/ipsec/MsipIpsecAPI.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/ipsec/README
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/mediahandler/AudioMedia.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/mediahandler/AudioPlugin.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/mediahandler/AudioPlugin.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/mediahandler/DtmfSender.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/mediahandler/KeyAgreement.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/mediahandler/Media.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on: trunk/libminisip/source/mediahandler/MediaCommandString.cxx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: trunk/libminisip/source/mediahandler/MediaHandler.cxx
===================================================================
--- trunk/libminisip/source/mediahandler/MediaHandler.cxx 2006-06-04 10:27:21 UTC (rev 2614)
+++ trunk/libminisip/source/mediahandler/MediaHandler.cxx 2006-06-04 10:36:05 UTC (rev 2615)
@@ -1,266 +1,266 @@
-/*
- Copyright (C) 2004-2006 the Minisip Team
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* Copyright (C) 2004, 2005, 2006
- *
- * Authors: Erik Eliasson <eliasson at it.kth.se>
- * Johan Bilien <jobi at via.ecp.fr>
-*/
-
-#include <config.h>
-
-#include<libminisip/mediahandler/MediaHandler.h>
-
-#include<string.h>
-#include<libminisip/sdp/SdpPacket.h>
-#include<libmikey/keyagreement.h>
-#include<libminisip/sip/SipDialogSecurityConfig.h>
-#include<libminisip/sip/SipSoftPhoneConfiguration.h>
-#include<libminisip/ipprovider/IpProvider.h>
-#include<libminisip/codecs/Codec.h>
-#include<libminisip/mediahandler/Session.h>
-#include<libminisip/mediahandler/MediaStream.h>
-
-#include<libminisip/mediahandler/Media.h>
-#include<libminisip/mediahandler/RtpReceiver.h>
-#include<libminisip/mediahandler/MediaCommandString.h>
-#include<libmnetutil/UDPSocket.h>
-
-#include<libminisip/soundcard/SoundIO.h>
-#include<libminisip/soundcard/SoundDevice.h>
-#include<libminisip/codecs/Codec.h>
-
-#ifdef _WIN32_WCE
-# include"../include/minisip_wce_extra_includes.h"
-#endif
-
-
-
-using namespace std;
-
-MediaHandler::MediaHandler( MRef<SipSoftPhoneConfiguration *> config, MRef<IpProvider *> ipProvider ){
-
- this->ipProvider = ipProvider;
- this->config = config;
- init();
-}
-
-MediaHandler::~MediaHandler(){
-// cerr << "~MediaHandler" << end;
-}
-
-void MediaHandler::init(){
-
- media.clear();
-
- MRef<MediaRegistry*> registry = MediaRegistry::getInstance();
- MediaRegistry::const_iterator i;
- MediaRegistry::const_iterator last = registry->end();
-
- for( i = registry->begin(); i != last; i++ ){
- MRef<MPlugin *> plugin = *i;
- MRef<MediaPlugin *> mediaPlugin = dynamic_cast<MediaPlugin*>( *plugin );
- if( mediaPlugin ){
- MRef<Media *> media = mediaPlugin->createMedia( config );
- MRef<AudioMedia *> audio = dynamic_cast<AudioMedia *>( *media );
-
- if( media ){
- registerMedia( media );
- }
-
- if( !audioMedia &&a