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

Side by Side Diff: content/renderer/media/audio_message_filter.cc

Issue 10537121: Adds AudioDevice factory for all audio clients in Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes based on review by Chris Created 8 years, 6 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/renderer/media/audio_message_filter.h" 5 #include "content/renderer/media/audio_message_filter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "content/common/child_process.h" 10 #include "content/common/child_process.h"
11 #include "content/common/media/audio_messages.h" 11 #include "content/common/media/audio_messages.h"
12 #include "content/renderer/render_thread_impl.h"
12 #include "ipc/ipc_logging.h" 13 #include "ipc/ipc_logging.h"
13 14
15 AudioMessageFilter* AudioMessageFilter::filter_ = NULL;
16
17 // static
18 AudioMessageFilter* AudioMessageFilter::current() {
19 return filter_;
20 }
21
14 AudioMessageFilter::AudioMessageFilter() 22 AudioMessageFilter::AudioMessageFilter()
15 : channel_(NULL) { 23 : channel_(NULL) {
16 VLOG(1) << "AudioMessageFilter::AudioMessageFilter()"; 24 VLOG(1) << "AudioMessageFilter::AudioMessageFilter()";
25 // DCHECK(RenderThreadImpl::current()) <<
henrika (OOO until Aug 14) 2012/06/26 15:55:48 Will remove this part to simplify unit testing.
henrika (OOO until Aug 14) 2012/06/27 08:23:16 Done.
26 // "AudioMessageFilter must be constructed on the render thread";
27 DCHECK(!filter_);
28 filter_ = this;
17 } 29 }
18 30
19 int32 AudioMessageFilter::AddDelegate(Delegate* delegate) { 31 int32 AudioMessageFilter::AddDelegate(Delegate* delegate) {
20 return delegates_.Add(delegate); 32 return delegates_.Add(delegate);
21 } 33 }
22 34
23 void AudioMessageFilter::RemoveDelegate(int32 id) { 35 void AudioMessageFilter::RemoveDelegate(int32 id) {
24 delegates_.Remove(id); 36 delegates_.Remove(id);
25 } 37 }
26 38
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 void AudioMessageFilter::OnFilterRemoved() { 74 void AudioMessageFilter::OnFilterRemoved() {
63 channel_ = NULL; 75 channel_ = NULL;
64 } 76 }
65 77
66 void AudioMessageFilter::OnChannelClosing() { 78 void AudioMessageFilter::OnChannelClosing() {
67 channel_ = NULL; 79 channel_ = NULL;
68 } 80 }
69 81
70 AudioMessageFilter::~AudioMessageFilter() { 82 AudioMessageFilter::~AudioMessageFilter() {
71 VLOG(1) << "AudioMessageFilter::~AudioMessageFilter()"; 83 VLOG(1) << "AudioMessageFilter::~AudioMessageFilter()";
84 DCHECK(filter_);
85 filter_ = NULL;
72 } 86 }
73 87
74 void AudioMessageFilter::OnStreamCreated( 88 void AudioMessageFilter::OnStreamCreated(
75 int stream_id, 89 int stream_id,
76 base::SharedMemoryHandle handle, 90 base::SharedMemoryHandle handle,
77 #if defined(OS_WIN) 91 #if defined(OS_WIN)
78 base::SyncSocket::Handle socket_handle, 92 base::SyncSocket::Handle socket_handle,
79 #else 93 #else
80 base::FileDescriptor socket_descriptor, 94 base::FileDescriptor socket_descriptor,
81 #endif 95 #endif
(...skipping 15 matching lines...) Expand all
97 void AudioMessageFilter::OnStreamStateChanged( 111 void AudioMessageFilter::OnStreamStateChanged(
98 int stream_id, AudioStreamState state) { 112 int stream_id, AudioStreamState state) {
99 Delegate* delegate = delegates_.Lookup(stream_id); 113 Delegate* delegate = delegates_.Lookup(stream_id);
100 if (!delegate) { 114 if (!delegate) {
101 DLOG(WARNING) << "Got audio stream event for a non-existent or removed" 115 DLOG(WARNING) << "Got audio stream event for a non-existent or removed"
102 " audio renderer."; 116 " audio renderer.";
103 return; 117 return;
104 } 118 }
105 delegate->OnStateChanged(state); 119 delegate->OnStateChanged(state);
106 } 120 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698