Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / voice_engine / channel.h

diff --git a/src/third_party/webrtc/voice_engine/channel.h b/src/third_party/webrtc/voice_engine/channel.h
index 535922f..1c2fc4a 100644 (file)
--- a/src/third_party/webrtc/voice_engine/channel.h
+++ b/src/third_party/webrtc/voice_engine/channel.h
@@ -294,8 +294,6 @@ public:
                                   int attenuationDb, bool playDtmfEvent);
     int SendTelephoneEventInband(unsigned char eventCode, int lengthMs,
                                  int attenuationDb, bool playDtmfEvent);
-    int SetDtmfPlayoutStatus(bool enable);
-    bool DtmfPlayoutStatus() const;
     int SetSendTelephoneEventPayloadType(unsigned char type);
     int GetSendTelephoneEventPayloadType(unsigned char& type);
 
@@ -353,83 +351,69 @@ public:
     void SetVideoEngineBWETarget(ViENetwork* vie_network, int video_channel);
 
     // From AudioPacketizationCallback in the ACM
-    int32_t SendData(FrameType frameType,
-                     uint8_t payloadType,
-                     uint32_t timeStamp,
-                     const uint8_t* payloadData,
-                     uint16_t payloadSize,
-                     const RTPFragmentationHeader* fragmentation);
+    virtual int32_t SendData(
+        FrameType frameType,
+        uint8_t payloadType,
+        uint32_t timeStamp,
+        const uint8_t* payloadData,
+        uint16_t payloadSize,
+        const RTPFragmentationHeader* fragmentation) OVERRIDE;
+
     // From ACMVADCallback in the ACM
-    int32_t InFrameType(int16_t frameType);
+    virtual int32_t InFrameType(int16_t frameType) OVERRIDE;
 
     int32_t OnRxVadDetected(int vadDecision);
 
     // From RtpData in the RTP/RTCP module
-    int32_t OnReceivedPayloadData(const uint8_t* payloadData,
-                                  uint16_t payloadSize,
-                                  const WebRtcRTPHeader* rtpHeader);
-
-    bool OnRecoveredPacket(const uint8_t* packet, int packet_length);
+    virtual int32_t OnReceivedPayloadData(
+        const uint8_t* payloadData,
+        uint16_t payloadSize,
+        const WebRtcRTPHeader* rtpHeader) OVERRIDE;
+    virtual bool OnRecoveredPacket(const uint8_t* packet,
+                                   int packet_length) OVERRIDE;
 
     // From RtpFeedback in the RTP/RTCP module
-    int32_t OnInitializeDecoder(
-            int32_t id,
-            int8_t payloadType,
-            const char payloadName[RTP_PAYLOAD_NAME_SIZE],
-            int frequency,
-            uint8_t channels,
-            uint32_t rate);
-
-    void OnPacketTimeout(int32_t id);
-
-    void OnReceivedPacket(int32_t id, RtpRtcpPacketType packetType);
-
-    void OnPeriodicDeadOrAlive(int32_t id,
-                               RTPAliveType alive);
-
-    void OnIncomingSSRCChanged(int32_t id,
-                               uint32_t ssrc);
-
-    void OnIncomingCSRCChanged(int32_t id,
-                               uint32_t CSRC, bool added);
-
-    void ResetStatistics(uint32_t ssrc);
+    virtual int32_t OnInitializeDecoder(
+        int32_t id,
+        int8_t payloadType,
+        const char payloadName[RTP_PAYLOAD_NAME_SIZE],
+        int frequency,
+        uint8_t channels,
+        uint32_t rate) OVERRIDE;
+    virtual void OnIncomingSSRCChanged(int32_t id,
+                                       uint32_t ssrc) OVERRIDE;
+    virtual void OnIncomingCSRCChanged(int32_t id,
+                                       uint32_t CSRC, bool added) OVERRIDE;
+    virtual void ResetStatistics(uint32_t ssrc) OVERRIDE;
 
     // From RtcpFeedback in the RTP/RTCP module
-    void OnApplicationDataReceived(int32_t id,
-                                   uint8_t subType,
-                                   uint32_t name,
-                                   uint16_t length,
-                                   const uint8_t* data);
+    virtual void OnApplicationDataReceived(int32_t id,
+                                           uint8_t subType,
+                                           uint32_t name,
+                                           uint16_t length,
+                                           const uint8_t* data) OVERRIDE;
 
     // From RtpAudioFeedback in the RTP/RTCP module
-    void OnReceivedTelephoneEvent(int32_t id,
-                                  uint8_t event,
-                                  bool endOfEvent);
-
-    void OnPlayTelephoneEvent(int32_t id,
-                              uint8_t event,
-                              uint16_t lengthMs,
-                              uint8_t volume);
+    virtual void OnPlayTelephoneEvent(int32_t id,
+                                      uint8_t event,
+                                      uint16_t lengthMs,
+                                      uint8_t volume) OVERRIDE;
 
     // From Transport (called by the RTP/RTCP module)
-    int SendPacket(int /*channel*/, const void *data, int len);
-    int SendRTCPPacket(int /*channel*/, const void *data, int len);
+    virtual int SendPacket(int /*channel*/, const void *data, int len) OVERRIDE;
+    virtual int SendRTCPPacket(int /*channel*/,
+                               const void *data,
+                               int len) OVERRIDE;
 
     // From MixerParticipant
-    int32_t GetAudioFrame(int32_t id, AudioFrame& audioFrame);
-    int32_t NeededFrequency(int32_t id);
-
-    // From MonitorObserver
-    void OnPeriodicProcess();
+    virtual int32_t GetAudioFrame(int32_t id, AudioFrame& audioFrame) OVERRIDE;
+    virtual int32_t NeededFrequency(int32_t id) OVERRIDE;
 
     // From FileCallback
-    void PlayNotification(int32_t id,
-                          uint32_t durationMs);
-    void RecordNotification(int32_t id,
-                            uint32_t durationMs);
-    void PlayFileEnded(int32_t id);
-    void RecordFileEnded(int32_t id);
+    virtual void PlayNotification(int32_t id, uint32_t durationMs) OVERRIDE;
+    virtual void RecordNotification(int32_t id, uint32_t durationMs) OVERRIDE;
+    virtual void PlayFileEnded(int32_t id) OVERRIDE;
+    virtual void RecordFileEnded(int32_t id) OVERRIDE;
 
     uint32_t InstanceId() const
     {
@@ -532,7 +516,6 @@ private:
     scoped_ptr<int16_t[]> mono_recording_audio_;
     // Downsamples to the codec rate if necessary.
     PushResampler<int16_t> input_resampler_;
-    uint8_t _audioLevel_dBov;
     FilePlayer* _inputFilePlayerPtr;
     FilePlayer* _outputFilePlayerPtr;
     FileRecorder* _outputFileRecorderPtr;
@@ -584,7 +567,6 @@ private:
     int32_t _sendFrameType; // Send data is voice, 1-voice, 0-otherwise
     VoERTCPObserver* _rtcpObserverPtr;
     // VoEBase
-    bool _externalPlayout;
     bool _externalMixing;
     bool _mixFileWithMicrophone;
     bool _rtcpObserver;
@@ -601,11 +583,6 @@ private:
     int8_t _lastPayloadType;
     bool _includeAudioLevelIndication;
     // VoENetwork
-    bool _rtpPacketTimedOut;
-    bool _rtpPacketTimeOutIsEnabled;
-    uint32_t _rtpTimeOutSeconds;
-    bool _connectionObserver;
-    VoEConnectionObserver* _connectionObserverPtr;
     AudioFrame::SpeechType _outputSpeechType;
     ViENetwork* vie_network_;
     int video_channel_;