| Index: media/audio/audio_device_thread.cc
|
| diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc
|
| index 20874599e68f5f7cfddeff0022291e64aa718b6c..048c9a1a1066702d772c620b7f762a8af0468ea3 100644
|
| --- a/media/audio/audio_device_thread.cc
|
| +++ b/media/audio/audio_device_thread.cc
|
| @@ -170,9 +170,9 @@ void AudioDeviceThread::Thread::ThreadMain() {
|
| void AudioDeviceThread::Thread::Run() {
|
| uint32_t buffer_index = 0;
|
| while (true) {
|
| - uint32_t pending_data = 0;
|
| - size_t bytes_read = socket_.Receive(&pending_data, sizeof(pending_data));
|
| - if (bytes_read != sizeof(pending_data))
|
| + Packet packet = {0, AudioTimestamp()};
|
| + size_t bytes_read = socket_.Receive(&packet, sizeof(packet));
|
| + if (bytes_read != sizeof(packet))
|
| break;
|
|
|
| // std::numeric_limits<uint32_t>::max() is a special signal which is
|
| @@ -183,10 +183,10 @@ void AudioDeviceThread::Thread::Run() {
|
| // the buffer index if |synchronized_buffers_| is true though.
|
| //
|
| // See comments in AudioOutputController::DoPause() for details on why.
|
| - if (pending_data != std::numeric_limits<uint32_t>::max()) {
|
| + if (packet.pending_data != std::numeric_limits<uint32_t>::max()) {
|
| base::AutoLock auto_lock(callback_lock_);
|
| if (callback_)
|
| - callback_->Process(pending_data);
|
| + callback_->Process(packet.pending_data, packet.timestamp);
|
| }
|
|
|
| // The usage of |synchronized_buffers_| differs between input and output
|
|
|