Index: webrtc/modules/audio_device/test/func_test_manager.h |
diff --git a/webrtc/modules/audio_device/test/func_test_manager.h b/webrtc/modules/audio_device/test/func_test_manager.h |
index 5ff62cd90ade9d7ac7569ae64cfcd29dfd55a71b..f5ddd3a21d513f5a016435f2eb327dddec6e0e62 100644 |
--- a/webrtc/modules/audio_device/test/func_test_manager.h |
+++ b/webrtc/modules/audio_device/test/func_test_manager.h |
@@ -85,48 +85,47 @@ public: |
class AudioTransportImpl: public AudioTransport |
{ |
public: |
- virtual int32_t |
- RecordedDataIsAvailable(const void* audioSamples, |
- const uint32_t nSamples, |
- const uint8_t nBytesPerSample, |
- const uint8_t nChannels, |
- const uint32_t samplesPerSec, |
- const uint32_t totalDelayMS, |
- const int32_t clockDrift, |
- const uint32_t currentMicLevel, |
- const bool keyPressed, |
- uint32_t& newMicLevel); |
- |
- virtual int32_t NeedMorePlayData(const uint32_t nSamples, |
- const uint8_t nBytesPerSample, |
- const uint8_t nChannels, |
- const uint32_t samplesPerSec, |
- void* audioSamples, |
- 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, |
- 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); |
- |
- 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); |
+ int32_t RecordedDataIsAvailable(const void* audioSamples, |
+ const uint32_t nSamples, |
+ const uint8_t nBytesPerSample, |
+ const uint8_t nChannels, |
+ const uint32_t samplesPerSec, |
+ const uint32_t totalDelayMS, |
+ const int32_t clockDrift, |
+ const uint32_t currentMicLevel, |
+ const bool keyPressed, |
+ uint32_t& newMicLevel) override; |
+ |
+ int32_t NeedMorePlayData(const uint32_t nSamples, |
+ const uint8_t nBytesPerSample, |
+ const uint8_t nChannels, |
+ const uint32_t samplesPerSec, |
+ void* audioSamples, |
+ uint32_t& nSamplesOut, |
+ int64_t* elapsed_time_ms, |
+ int64_t* ntp_time_ms) override; |
+ |
+ int OnDataAvailable(const 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) override; |
+ |
+ void PushCaptureData(int voe_channel, const void* audio_data, |
+ int bits_per_sample, int sample_rate, |
+ int number_of_channels, |
+ int number_of_frames) override; |
+ |
+ 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) override; |
AudioTransportImpl(AudioDeviceModule* audioDevice); |
~AudioTransportImpl(); |