diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:19:33 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-20 22:19:33 +0000 |
| commit | 9a499a01f4e66080673c8a08496e9c3b488c3fdf (patch) | |
| tree | 44fc9d9d220404f59c0cd709183c062357f475dd /content | |
| parent | b6c1d7cd9f79ed599e0fef24569fee1b955693ce (diff) | |
| download | chromium_src-9a499a01f4e66080673c8a08496e9c3b488c3fdf.zip chromium_src-9a499a01f4e66080673c8a08496e9c3b488c3fdf.tar.gz chromium_src-9a499a01f4e66080673c8a08496e9c3b488c3fdf.tar.bz2 | |
Introduce shared_memory_support media target for PPAPI.
Allows PPAPI to directly utilize shared memory utility code instead
of duplicating it and CHECK'ing for equivalency.
Required to eventually convert PPAPI to using an AudioBus and floats
in PPB_Audio_Shared::Run(). http://crbug.com/114700
BUG=123203
TEST=unittests
Review URL: https://chromiumcodereview.appspot.com/10826296
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/media/audio_renderer_host.cc | 2 | ||||
| -rw-r--r-- | content/browser/renderer_host/media/audio_sync_reader.cc | 4 | ||||
| -rw-r--r-- | content/content_common.gypi | 1 | ||||
| -rw-r--r-- | content/content_tests.gypi | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc index 27b8825..0042f28 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_renderer_host.cc @@ -12,7 +12,7 @@ #include "content/browser/renderer_host/media/audio_sync_reader.h" #include "content/common/media/audio_messages.h" #include "content/public/browser/media_observer.h" -#include "media/audio/audio_util.h" +#include "media/audio/shared_memory_util.h" using content::BrowserMessageFilter; using content::BrowserThread; diff --git a/content/browser/renderer_host/media/audio_sync_reader.cc b/content/browser/renderer_host/media/audio_sync_reader.cc index 113c4fc..2f06f55 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; @@ -31,7 +31,7 @@ bool AudioSyncReader::DataReady() { // 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( diff --git a/content/content_common.gypi b/content/content_common.gypi index 54974ae..749b93b 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -10,6 +10,7 @@ '../gpu/gpu.gyp:gpu_ipc', '../ipc/ipc.gyp:ipc', '../media/media.gyp:media', + '../media/media.gyp:shared_memory_support', '../net/net.gyp:net', '../ppapi/ppapi_internal.gyp:ppapi_shared', '../skia/skia.gyp:skia', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 7c46308..469f112 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -216,6 +216,7 @@ '../ipc/ipc.gyp:test_support_ipc', '../jingle/jingle.gyp:jingle_glue_test_util', '../media/media.gyp:media_test_support', + '../media/media.gyp:shared_memory_support', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', |