Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Side by Side Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/audio_renderer_host.h" 5 #include "content/browser/renderer_host/media/audio_renderer_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/process.h" 9 #include "base/process.h"
10 #include "base/shared_memory.h" 10 #include "base/shared_memory.h"
(...skipping 11 matching lines...) Expand all
22 : stream_id(0), 22 : stream_id(0),
23 pending_close(false) { 23 pending_close(false) {
24 } 24 }
25 25
26 AudioRendererHost::AudioEntry::~AudioEntry() {} 26 AudioRendererHost::AudioEntry::~AudioEntry() {}
27 27
28 /////////////////////////////////////////////////////////////////////////////// 28 ///////////////////////////////////////////////////////////////////////////////
29 // AudioRendererHost implementations. 29 // AudioRendererHost implementations.
30 AudioRendererHost::AudioRendererHost( 30 AudioRendererHost::AudioRendererHost(
31 content::ResourceContext* resource_context, 31 content::ResourceContext* resource_context,
32 AudioManager* audio_manager) 32 media::AudioManager* audio_manager)
33 : resource_context_(resource_context), 33 : resource_context_(resource_context),
34 audio_manager_(audio_manager) { 34 audio_manager_(audio_manager) {
35 } 35 }
36 36
37 AudioRendererHost::~AudioRendererHost() { 37 AudioRendererHost::~AudioRendererHost() {
38 DCHECK(audio_entries_.empty()); 38 DCHECK(audio_entries_.empty());
39 } 39 }
40 40
41 void AudioRendererHost::OnChannelClosing() { 41 void AudioRendererHost::OnChannelClosing() {
42 BrowserMessageFilter::OnChannelClosing(); 42 BrowserMessageFilter::OnChannelClosing();
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 IPC_MESSAGE_HANDLER(AudioHostMsg_FlushStream, OnFlushStream) 189 IPC_MESSAGE_HANDLER(AudioHostMsg_FlushStream, OnFlushStream)
190 IPC_MESSAGE_HANDLER(AudioHostMsg_CloseStream, OnCloseStream) 190 IPC_MESSAGE_HANDLER(AudioHostMsg_CloseStream, OnCloseStream)
191 IPC_MESSAGE_HANDLER(AudioHostMsg_SetVolume, OnSetVolume) 191 IPC_MESSAGE_HANDLER(AudioHostMsg_SetVolume, OnSetVolume)
192 IPC_MESSAGE_UNHANDLED(handled = false) 192 IPC_MESSAGE_UNHANDLED(handled = false)
193 IPC_END_MESSAGE_MAP_EX() 193 IPC_END_MESSAGE_MAP_EX()
194 194
195 return handled; 195 return handled;
196 } 196 }
197 197
198 void AudioRendererHost::OnCreateStream( 198 void AudioRendererHost::OnCreateStream(
199 int stream_id, const AudioParameters& params) { 199 int stream_id, const media::AudioParameters& params) {
200 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 200 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
201 DCHECK(LookupById(stream_id) == NULL); 201 DCHECK(LookupById(stream_id) == NULL);
202 202
203 AudioParameters audio_params(params); 203 media::AudioParameters audio_params(params);
204 DCHECK_GT(audio_params.frames_per_buffer(), 0); 204 DCHECK_GT(audio_params.frames_per_buffer(), 0);
205 205
206 uint32 buffer_size = audio_params.GetBytesPerBuffer(); 206 uint32 buffer_size = audio_params.GetBytesPerBuffer();
207 207
208 scoped_ptr<AudioEntry> entry(new AudioEntry()); 208 scoped_ptr<AudioEntry> entry(new AudioEntry());
209 209
210 // Create the shared memory and share with the renderer process. 210 // Create the shared memory and share with the renderer process.
211 uint32 shared_memory_size = 211 uint32 shared_memory_size =
212 media::TotalSharedMemorySizeInBytes(buffer_size); 212 media::TotalSharedMemorySizeInBytes(buffer_size);
213 if (!entry->shared_memory.CreateAndMapAnonymous(shared_memory_size)) { 213 if (!entry->shared_memory.CreateAndMapAnonymous(shared_memory_size)) {
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 } 394 }
395 return NULL; 395 return NULL;
396 } 396 }
397 397
398 content::MediaObserver* AudioRendererHost::GetMediaObserver() { 398 content::MediaObserver* AudioRendererHost::GetMediaObserver() {
399 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 399 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
400 if (resource_context_) 400 if (resource_context_)
401 return resource_context_->GetMediaObserver(); 401 return resource_context_->GetMediaObserver();
402 return NULL; 402 return NULL;
403 } 403 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698