Added a new OnMoreData() interface which will not feed the playout data to APM.

BUG=3147
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/11059005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5895 4adac7df-926f-26a2-2b94-8c16560cd09d

1 files changed, 21 insertions, 2 deletions

diff --git a/webrtc/modules/audio_device/include/audio_device_defines.h b/webrtc/modules/audio_device/include/audio_device_defines.h
index 9f3e24b10a..0704ea8321 100644
--- a/webrtc/modules/audio_device/include/audio_device_defines.h
+++ b/webrtc/modules/audio_device/include/audio_device_defines.h
@@ -101,13 +101,32 @@ public:
     // Method to pass the captured audio data to the specific VoE channel.
     // |voe_channel| is the id of the VoE channel which is the sink to the
     // capture data.
-    // TODO(xians): Make the interface pure virtual after libjingle
-    // has its implementation.
+    // TODO(xians): Remove this interface after Libjingle switches to
+    // PushCaptureData().
     virtual void OnData(int voe_channel, const void* audio_data,
                         int bits_per_sample, int sample_rate,
                         int number_of_channels,
                         int number_of_frames) {}
 
+    // Method to push the captured audio data to the specific VoE channel.
+    // The data will not undergo audio processing.
+    // |voe_channel| is the id of the VoE channel which is the sink to the
+    // capture data.
+    // TODO(xians): Make the interface pure virtual after Libjingle
+    // has its implementation.
+    virtual void PushCaptureData(int voe_channel, const void* audio_data,
+                                 int bits_per_sample, int sample_rate,
+                                 int number_of_channels,
+                                 int number_of_frames) {}
+
+    // Method to pull mixed render audio data from all active VoE channels.
+    // The data will not be passed as reference for audio processing internally.
+    // TODO(xians): Support getting the unmixed render data from specific VoE
+    // channel.
+    virtual void PullRenderData(int bits_per_sample, int sample_rate,
+                                int number_of_channels, int number_of_frames,
+                                void* audio_data) {}
+
 protected:
     virtual ~AudioTransport() {}
 };