| 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 a91ae814e5860400499c03dd1a51bbae0dc9e048..76382914197d200fd931536e8cc178ed502f551f 100644
|
| --- a/webrtc/modules/audio_device/test/func_test_manager.h
|
| +++ b/webrtc/modules/audio_device/test/func_test_manager.h
|
| @@ -49,7 +49,7 @@ struct AudioPacket
|
| uint8_t dataBuffer[4 * 960];
|
| size_t nSamples;
|
| size_t nBytesPerSample;
|
| - uint8_t nChannels;
|
| + size_t nChannels;
|
| uint32_t samplesPerSec;
|
| };
|
|
|
| @@ -88,7 +88,7 @@ public:
|
| int32_t RecordedDataIsAvailable(const void* audioSamples,
|
| const size_t nSamples,
|
| const size_t nBytesPerSample,
|
| - const uint8_t nChannels,
|
| + const size_t nChannels,
|
| const uint32_t samplesPerSec,
|
| const uint32_t totalDelayMS,
|
| const int32_t clockDrift,
|
| @@ -98,35 +98,13 @@ public:
|
|
|
| int32_t NeedMorePlayData(const size_t nSamples,
|
| const size_t nBytesPerSample,
|
| - const uint8_t nChannels,
|
| + const size_t nChannels,
|
| const uint32_t samplesPerSec,
|
| void* audioSamples,
|
| size_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,
|
| - size_t 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,
|
| - size_t number_of_frames) override;
|
| -
|
| - void PullRenderData(int bits_per_sample, int sample_rate,
|
| - int number_of_channels, size_t number_of_frames,
|
| - void* audio_data,
|
| - int64_t* elapsed_time_ms,
|
| - int64_t* ntp_time_ms) override;
|
| -
|
| AudioTransportImpl(AudioDeviceModule* audioDevice);
|
| ~AudioTransportImpl();
|
|
|
|
|