diff options
| author | xians@webrtc.org <xians@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-31 16:23:37 +0000 |
|---|---|---|
| committer | xians@webrtc.org <xians@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-31 16:23:37 +0000 |
| commit | 44f1239d9595c91f69f656e5beb1382463c4da8f (patch) | |
| tree | bb23527af93df9bc466ce5b2451a8b0077e79d30 /voice_engine/voe_base_impl.h | |
| parent | 60bf21e85cdf9a8dd18376d934bde5e785ebba87 (diff) | |
| download | webrtc-44f1239d9595c91f69f656e5beb1382463c4da8f.tar.gz | |
Merge r4326 from stable to trunk.
r4326 was mistakenly committed to stable, so this is to re-merge back to trunk.
Add new interface to support multiple sources in webrtc.
CaptureData() will be called by chrome with a flag |need_audio_processing| to
indicate if the data needs to be processed by APM or not. Different from the old
interface that will send the data to all voe channels, the new interface will
specify a list of voe channels that the data is demultiplexing to.
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1919004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4449 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voe_base_impl.h')
| -rw-r--r-- | voice_engine/voe_base_impl.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/voice_engine/voe_base_impl.h b/voice_engine/voe_base_impl.h index 4665e808..c63798f3 100644 --- a/voice_engine/voe_base_impl.h +++ b/voice_engine/voe_base_impl.h @@ -90,6 +90,17 @@ public: void* audioSamples, uint32_t& nSamplesOut); + virtual int OnDataAvailable(int voe_channels[], + int number_of_voe_channels, + const int16_t* audio_data, + int sample_rate, + int number_of_channels, + int number_of_frames, + int audio_delay_milliseconds, + int current_volume, + bool key_pressed, + bool need_audio_processing); + // AudioDeviceObserver virtual void OnErrorIsReported(ErrorCode error); virtual void OnWarningIsReported(WarningCode warning); |