| Index: content/browser/renderer_host/media/audio_sync_reader.cc
|
| diff --git a/content/browser/renderer_host/media/audio_sync_reader.cc b/content/browser/renderer_host/media/audio_sync_reader.cc
|
| index 113c4fc0a213bbc5d64dc2f0846a3112e3ddc020..cd6db16cd74b23e5dbc15a6a9a7fe022bfd0ec5d 100644
|
| --- a/content/browser/renderer_host/media/audio_sync_reader.cc
|
| +++ b/content/browser/renderer_host/media/audio_sync_reader.cc
|
| @@ -10,7 +10,7 @@
|
| #include "base/shared_memory.h"
|
| #include "base/threading/platform_thread.h"
|
| #include "media/audio/audio_buffers_state.h"
|
| -#include "media/audio/audio_util.h"
|
| +#include "media/audio/shared_memory_util.h"
|
|
|
| #if defined(OS_WIN)
|
| const int kMinIntervalBetweenReadCallsInMs = 10;
|
| @@ -26,17 +26,17 @@ AudioSyncReader::~AudioSyncReader() {
|
| bool AudioSyncReader::DataReady() {
|
| return !media::IsUnknownDataSize(
|
| shared_memory_,
|
| - media::PacketSizeSizeInBytes(shared_memory_->created_size()));
|
| + media::PacketSizeInBytes(shared_memory_->created_size()));
|
| }
|
|
|
| // media::AudioOutputController::SyncReader implementations.
|
| void AudioSyncReader::UpdatePendingBytes(uint32 bytes) {
|
| - if (bytes != static_cast<uint32>(media::AudioOutputController::kPauseMark)) {
|
| + if (bytes != static_cast<uint32>(media::kPauseMark)) {
|
| // Store unknown length of data into buffer, so we later
|
| // can find out if data became available.
|
| media::SetUnknownDataSize(
|
| shared_memory_,
|
| - media::PacketSizeSizeInBytes(shared_memory_->created_size()));
|
| + media::PacketSizeInBytes(shared_memory_->created_size()));
|
| }
|
|
|
| if (socket_.get()) {
|
| @@ -45,7 +45,7 @@ void AudioSyncReader::UpdatePendingBytes(uint32 bytes) {
|
| }
|
|
|
| uint32 AudioSyncReader::Read(void* data, uint32 size) {
|
| - uint32 max_size = media::PacketSizeSizeInBytes(
|
| + uint32 max_size = media::PacketSizeInBytes(
|
| shared_memory_->created_size());
|
|
|
| #if defined(OS_WIN)
|
|
|