From 0182c73c34be9dea04a0274755bdba266cb0e7f9 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Tue, 1 Aug 2006 14:40:48 +0000 Subject: Applying changeset 266 from 0.5 to trunk: Removed the unused old RTP mixer from the VoIp.dll git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@319 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkaudio/audiocaptureplugins/voip/Rtp.h | 36 --------------------------------- 1 file changed, 36 deletions(-) (limited to 'orkaudio/audiocaptureplugins/voip/Rtp.h') diff --git a/orkaudio/audiocaptureplugins/voip/Rtp.h b/orkaudio/audiocaptureplugins/voip/Rtp.h index a846c5f..53b4d00 100644 --- a/orkaudio/audiocaptureplugins/voip/Rtp.h +++ b/orkaudio/audiocaptureplugins/voip/Rtp.h @@ -14,14 +14,8 @@ #ifndef __RTP_H__ #define __RTP_H__ -#include "AudioCapture.h" #include "boost/shared_ptr.hpp" #include "StdString.h" -#include "LogManager.h" - -#define NUM_SAMPLES_CIRCULAR_BUFFER 8000 -#define NUM_SAMPLES_TRIGGER 4000 // when we have this number of available samples make a shipment -#define NUM_SAMPLES_SHIPMENT_HOLDOFF 2000 // when shipping, ship everything but this number of samples // useful info we extract from an RTP packet @@ -46,35 +40,5 @@ public: typedef boost::shared_ptr RtpPacketInfoRef; -// Ring buffer based on RTP timestamps -// Gathers both sides of the conversation and mixes them into single channel -// Robust to silence suppression -// Supports RTP buffers of arbitrary sizes in both directions. -class RtpRingBuffer -{ -public: - RtpRingBuffer(); - void AddRtpPacket(RtpPacketInfoRef&); - void SetCapturePort(CStdString& port); -private: - void StoreRtpPacket(RtpPacketInfoRef&); - void CreateShipment(size_t silenceSize); - unsigned int FreeSpace(); - unsigned int UsedSpace(); - short* GetHoldOffPtr(); - short* CircularPointerAddOffset(short *ptr, size_t offset); - short* CicularPointerSubtractOffset(short *ptr, size_t offset); - - short* m_writePtr; // pointer after newest RTP data we've received - short* m_readPtr; // where to read from next - unsigned int m_readTimestamp; // timestamp that the next shipment will have - unsigned int m_writeTimestamp; // timestamp that the next RTP buffer should have - short* m_bufferEnd; - short m_buffer[NUM_SAMPLES_CIRCULAR_BUFFER]; - CStdString m_capturePort; - LoggerPtr m_log; - unsigned int m_shippedSamples; -}; - #endif -- cgit v1.2.3