| Index: media/audio/audio_input_device.cc
|
| diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc
|
| index cee639bb68073055d8dab39ff8306086e9c2cfbb..ce3067cd5d75b95ec9458e3b228d6142a3d1901b 100644
|
| --- a/media/audio/audio_input_device.cc
|
| +++ b/media/audio/audio_input_device.cc
|
| @@ -41,7 +41,7 @@ class AudioInputDevice::AudioThreadCallback
|
| void MapSharedMemory() override;
|
|
|
| // Called whenever we receive notifications about pending data.
|
| - void Process(uint32_t pending_data) override;
|
| + void Process(int64_t pending_data, base::TimeTicks data_timestamp) override;
|
|
|
| private:
|
| const double bytes_per_ms_;
|
| @@ -307,7 +307,9 @@ void AudioInputDevice::AudioThreadCallback::MapSharedMemory() {
|
| }
|
| }
|
|
|
| -void AudioInputDevice::AudioThreadCallback::Process(uint32_t pending_data) {
|
| +void AudioInputDevice::AudioThreadCallback::Process(
|
| + int64_t pending_data,
|
| + base::TimeTicks data_timestamp) {
|
| // The shared memory represents parameters, size of the data buffer and the
|
| // actual data buffer containing audio data. Map the memory into this
|
| // structure and parse out parameters and the data area.
|
| @@ -329,9 +331,9 @@ void AudioInputDevice::AudioThreadCallback::Process(uint32_t pending_data) {
|
| capture_callback_->OnCaptureError(message);
|
| }
|
| if (current_segment_id_ != static_cast<int>(pending_data)) {
|
| - std::string message = base::StringPrintf(
|
| - "Segment id not matching. Remote = %u. Local = %d.",
|
| - pending_data, current_segment_id_);
|
| + std::string message =
|
| + base::StringPrintf("Segment id not matching. Remote = %d. Local = %d.",
|
| + static_cast<int>(pending_data), current_segment_id_);
|
| LOG(ERROR) << message;
|
| capture_callback_->OnCaptureError(message);
|
| }
|
|
|