diff options
| author | solenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-18 11:27:22 +0000 |
|---|---|---|
| committer | solenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-18 11:27:22 +0000 |
| commit | a56c5b4327c6a89238ee5b1ffd3ace78b20afaef (patch) | |
| tree | 415052fb015da98f1722fb0d03fa6764640eb301 /voice_engine/channel.h | |
| parent | 3e4cdeca70f8a9499fb746fa4e9a094a449dda86 (diff) | |
| download | webrtc-a56c5b4327c6a89238ee5b1ffd3ace78b20afaef.tar.gz | |
Remove external encryption API for VoE.
BUG=
R=henrika@webrtc.org, henrikg@webrtc.org, phoglund@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/8459004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5564 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/channel.h')
| -rw-r--r-- | voice_engine/channel.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/voice_engine/channel.h b/voice_engine/channel.h index 3dfeedc4..3fadf929 100644 --- a/voice_engine/channel.h +++ b/voice_engine/channel.h @@ -218,10 +218,6 @@ public: // VoEVideoSyncExtended int GetRtpRtcp(RtpRtcp** rtpRtcpModule, RtpReceiver** rtp_receiver) const; - // VoEEncryption - int RegisterExternalEncryption(Encryption& encryption); - int DeRegisterExternalEncryption(); - // VoEDtmf int SendTelephoneEventOutband(unsigned char eventCode, int lengthMs, int attenuationDb, bool playDtmfEvent); @@ -484,10 +480,6 @@ private: bool _outputExternalMedia; VoEMediaProcess* _inputExternalMediaCallbackPtr; VoEMediaProcess* _outputExternalMediaCallbackPtr; - uint8_t* _encryptionRTPBufferPtr; - uint8_t* _decryptionRTPBufferPtr; - uint8_t* _encryptionRTCPBufferPtr; - uint8_t* _decryptionRTCPBufferPtr; uint32_t _timeStamp; uint8_t _sendTelephoneEventPayloadType; @@ -509,7 +501,6 @@ private: VoiceEngineObserver* _voiceEngineObserverPtr; // owned by base CriticalSectionWrapper* _callbackCritSectPtr; // owned by base Transport* _transportPtr; // WebRtc socket or external transport - Encryption* _encryptionPtr; // WebRtc SRTP or external encryption scoped_ptr<AudioProcessing> rtp_audioproc_; scoped_ptr<AudioProcessing> rx_audioproc_; // far end AudioProcessing VoERxVadCallback* _rxVadObserverPtr; @@ -533,9 +524,6 @@ private: float _panLeft; float _panRight; float _outputGain; - // VoEEncryption - bool _encrypting; - bool _decrypting; // VoEDtmf bool _playOutbandDtmfEvent; bool _playInbandDtmfEvent; |