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

Side by Side Diff: content/renderer/pepper/pepper_platform_audio_output_impl.h

Issue 11359196: Associate audio streams with their source/destination RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Plus, removed CalledOnValidThread DCHECK from sampleRate() call since nothing mutates. Created 8 years 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 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_IMPL_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_IMPL_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_IMPL_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "media/audio/audio_output_ipc.h" 10 #include "media/audio/audio_output_ipc.h"
11 #include "webkit/plugins/ppapi/plugin_delegate.h" 11 #include "webkit/plugins/ppapi/plugin_delegate.h"
12 12
13 namespace media { 13 namespace media {
14 class AudioParameters; 14 class AudioParameters;
15 } 15 }
16 16
17 namespace base { 17 namespace base {
18 class MessageLoopProxy; 18 class MessageLoopProxy;
19 } 19 }
20 20
21 namespace content { 21 namespace content {
22 22
23 class AudioMessageFilter;
24
23 class PepperPlatformAudioOutputImpl 25 class PepperPlatformAudioOutputImpl
24 : public webkit::ppapi::PluginDelegate::PlatformAudioOutput, 26 : public webkit::ppapi::PluginDelegate::PlatformAudioOutput,
25 public media::AudioOutputIPCDelegate, 27 public media::AudioOutputIPCDelegate,
26 public base::RefCountedThreadSafe<PepperPlatformAudioOutputImpl> { 28 public base::RefCountedThreadSafe<PepperPlatformAudioOutputImpl> {
27 public: 29 public:
28 // Factory function, returns NULL on failure. StreamCreated() will be called 30 // Factory function, returns NULL on failure. StreamCreated() will be called
29 // when the stream is created. 31 // when the stream is created.
30 static PepperPlatformAudioOutputImpl* Create( 32 static PepperPlatformAudioOutputImpl* Create(
31 int sample_rate, 33 int sample_rate,
32 int frames_per_buffer, 34 int frames_per_buffer,
35 int source_render_view_id,
33 webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client); 36 webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client);
34 37
35 // PlatformAudioOutput implementation (called on main thread). 38 // PlatformAudioOutput implementation (called on main thread).
36 virtual bool StartPlayback() OVERRIDE; 39 virtual bool StartPlayback() OVERRIDE;
37 virtual bool StopPlayback() OVERRIDE; 40 virtual bool StopPlayback() OVERRIDE;
38 virtual void ShutDown() OVERRIDE; 41 virtual void ShutDown() OVERRIDE;
39 42
40 // media::AudioOutputIPCDelegate implementation. 43 // media::AudioOutputIPCDelegate implementation.
41 virtual void OnStateChanged( 44 virtual void OnStateChanged(
42 media::AudioOutputIPCDelegate::State state) OVERRIDE; 45 media::AudioOutputIPCDelegate::State state) OVERRIDE;
43 virtual void OnStreamCreated(base::SharedMemoryHandle handle, 46 virtual void OnStreamCreated(base::SharedMemoryHandle handle,
44 base::SyncSocket::Handle socket_handle, 47 base::SyncSocket::Handle socket_handle,
45 int length) OVERRIDE; 48 int length) OVERRIDE;
46 virtual void OnIPCClosed() OVERRIDE; 49 virtual void OnIPCClosed() OVERRIDE;
47 50
48 protected: 51 protected:
49 virtual ~PepperPlatformAudioOutputImpl(); 52 virtual ~PepperPlatformAudioOutputImpl();
50 53
51 private: 54 private:
52 friend class base::RefCountedThreadSafe<PepperPlatformAudioOutputImpl>; 55 friend class base::RefCountedThreadSafe<PepperPlatformAudioOutputImpl>;
53 56
54 PepperPlatformAudioOutputImpl(); 57 PepperPlatformAudioOutputImpl();
55 58
56 bool Initialize( 59 bool Initialize(
57 int sample_rate, 60 int sample_rate,
58 int frames_per_buffer, 61 int frames_per_buffer,
62 int source_render_view_id,
59 webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client); 63 webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client);
60 64
61 // I/O thread backends to above functions. 65 // I/O thread backends to above functions.
62 void InitializeOnIOThread(const media::AudioParameters& params); 66 void InitializeOnIOThread(const media::AudioParameters& params,
67 int source_render_view_id);
63 void StartPlaybackOnIOThread(); 68 void StartPlaybackOnIOThread();
64 void StopPlaybackOnIOThread(); 69 void StopPlaybackOnIOThread();
65 void ShutDownOnIOThread(); 70 void ShutDownOnIOThread();
66 71
67 // The client to notify when the stream is created. THIS MUST ONLY BE 72 // The client to notify when the stream is created. THIS MUST ONLY BE
68 // ACCESSED ON THE MAIN THREAD. 73 // ACCESSED ON THE MAIN THREAD.
69 webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client_; 74 webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client_;
70 75
71 // Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE 76 // Used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE
72 // I/O thread except to send messages and get the message loop. 77 // I/O thread except to send messages and get the message loop.
73 media::AudioOutputIPC* ipc_; 78 scoped_refptr<AudioMessageFilter> ipc_;
74 79
75 // Our ID on the MessageFilter. THIS MUST ONLY BE ACCESSED ON THE I/O THREAD 80 // Our ID on the MessageFilter. THIS MUST ONLY BE ACCESSED ON THE I/O THREAD
76 // or else you could race with the initialize function which sets it. 81 // or else you could race with the initialize function which sets it.
77 int32 stream_id_; 82 int32 stream_id_;
78 83
79 base::MessageLoopProxy* main_message_loop_proxy_; 84 base::MessageLoopProxy* main_message_loop_proxy_;
80 85
81 DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioOutputImpl); 86 DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioOutputImpl);
82 }; 87 };
83 88
84 } // namespace content 89 } // namespace content
85 90
86 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_IMPL_H_ 91 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLATFORM_AUDIO_OUTPUT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698