diff options
Diffstat (limited to 'chromium/third_party/webrtc/voice_engine/voe_base_impl.h')
| -rw-r--r-- | chromium/third_party/webrtc/voice_engine/voe_base_impl.h | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/chromium/third_party/webrtc/voice_engine/voe_base_impl.h b/chromium/third_party/webrtc/voice_engine/voe_base_impl.h index bee2ea37cfe..985ef5d8382 100644 --- a/chromium/third_party/webrtc/voice_engine/voe_base_impl.h +++ b/chromium/third_party/webrtc/voice_engine/voe_base_impl.h @@ -55,20 +55,12 @@ public: virtual int StopSend(int channel); - virtual int SetNetEQPlayoutMode(int channel, NetEqModes mode); - - virtual int GetNetEQPlayoutMode(int channel, NetEqModes& mode); - - virtual int SetOnHoldStatus(int channel, - bool enable, - OnHoldModes mode = kHoldSendAndPlay); - - virtual int GetOnHoldStatus(int channel, bool& enabled, OnHoldModes& mode); - virtual int GetVersion(char version[1024]); virtual int LastError(); + virtual AudioTransport* audio_transport() { return this; } + // AudioTransport virtual int32_t RecordedDataIsAvailable(const void* audioSamples, @@ -78,7 +70,7 @@ public: uint32_t samplesPerSec, uint32_t totalDelayMS, int32_t clockDrift, - uint32_t currentMicLevel, + uint32_t micLevel, bool keyPressed, uint32_t& newMicLevel); @@ -87,7 +79,9 @@ public: uint8_t nChannels, uint32_t samplesPerSec, void* audioSamples, - uint32_t& nSamplesOut); + uint32_t& nSamplesOut, + int64_t* elapsed_time_ms, + int64_t* ntp_time_ms); virtual int OnDataAvailable(const int voe_channels[], int number_of_voe_channels, @@ -96,10 +90,24 @@ public: int number_of_channels, int number_of_frames, int audio_delay_milliseconds, - int current_volume, + int volume, bool key_pressed, bool need_audio_processing); + 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); + + 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); + + virtual void PullRenderData(int bits_per_sample, int sample_rate, + int number_of_channels, int number_of_frames, + void* audio_data, + int64_t* elapsed_time_ms, + int64_t* ntp_time_ms); + // AudioDeviceObserver virtual void OnErrorIsReported(ErrorCode error); virtual void OnWarningIsReported(WarningCode warning); @@ -129,9 +137,15 @@ private: uint32_t number_of_frames, uint32_t audio_delay_milliseconds, int32_t clock_drift, - uint32_t current_volume, + uint32_t volume, bool key_pressed); + void GetPlayoutData(int sample_rate, int number_of_channels, + int number_of_frames, bool feed_data_to_apm, + void* audio_data, + int64_t* elapsed_time_ms, + int64_t* ntp_time_ms); + int32_t AddBuildInfo(char* str) const; int32_t AddVoEVersion(char* str) const; @@ -141,15 +155,10 @@ private: #ifdef WEBRTC_EXTERNAL_TRANSPORT int32_t AddExternalTransportBuild(char* str) const; #endif -#ifdef WEBRTC_VOE_EXTERNAL_REC_AND_PLAYOUT - int32_t AddExternalRecAndPlayoutBuild(char* str) const; -#endif VoiceEngineObserver* _voiceEngineObserverPtr; CriticalSectionWrapper& _callbackCritSect; bool _voiceEngineObserver; - uint32_t _oldVoEMicLevel; - uint32_t _oldMicLevel; AudioFrame _audioFrame; voe::SharedData* _shared; }; |