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

Side by Side Diff: content/renderer/media/webaudio_capturer_source.h

Issue 23691038: Switch LiveAudio to source provider solution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the android bot Created 7 years, 3 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 #ifndef CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "base/threading/thread_checker.h"
10 #include "media/audio/audio_parameters.h" 11 #include "media/audio/audio_parameters.h"
11 #include "media/base/audio_capturer_source.h" 12 #include "media/base/audio_capturer_source.h"
12 #include "media/base/audio_fifo.h" 13 #include "media/base/audio_fifo.h"
13 #include "third_party/WebKit/public/platform/WebAudioDestinationConsumer.h" 14 #include "third_party/WebKit/public/platform/WebAudioDestinationConsumer.h"
14 #include "third_party/WebKit/public/platform/WebVector.h" 15 #include "third_party/WebKit/public/platform/WebVector.h"
15 16
16 namespace content { 17 namespace content {
17 18
18 class WebRtcAudioCapturer; 19 class WebRtcLocalAudioTrack;
20 class WebRtcLocalAudioSourceProvider;
19 21
20 // WebAudioCapturerSource is the missing link between 22 // WebAudioCapturerSource is the missing link between
21 // WebAudio's MediaStreamAudioDestinationNode and WebRtcAudioCapturer. 23 // WebAudio's MediaStreamAudioDestinationNode and WebRtcLocalAudioTrack.
22 // 24 //
23 // 1. WebKit calls the setFormat() method setting up the basic stream format 25 // 1. WebKit calls the setFormat() method setting up the basic stream format
24 // (channels, and sample-rate). At this time, it dispatches this information 26 // (channels, and sample-rate).
25 // to the WebRtcAudioCapturer by calling its SetCapturerSource() method. 27 // 2. consumeAudio() is called periodically by WebKit which dispatches the
26 // 2. Initialize() is called, where we should get back the same 28 // audio stream to the WebRtcLocalAudioTrack::Capture() method.
27 // stream format information as (1). We also get the CaptureCallback here.
28 // 3. consumeAudio() is called periodically by WebKit which dispatches the
29 // audio stream to the CaptureCallback::Capture() method.
30 class WebAudioCapturerSource 29 class WebAudioCapturerSource
31 : public media::AudioCapturerSource, 30 : public base::RefCountedThreadSafe<WebAudioCapturerSource>,
32 public WebKit::WebAudioDestinationConsumer { 31 public WebKit::WebAudioDestinationConsumer {
33 public: 32 public:
34 explicit WebAudioCapturerSource(WebRtcAudioCapturer* capturer); 33 WebAudioCapturerSource();
35 34
36 // WebAudioDestinationConsumer implementation. 35 // WebAudioDestinationConsumer implementation.
37 // setFormat() is called early on, so that we can configure the capturer. 36 // setFormat() is called early on, so that we can configure the audio track.
38 virtual void setFormat(size_t number_of_channels, float sample_rate) OVERRIDE; 37 virtual void setFormat(size_t number_of_channels, float sample_rate) OVERRIDE;
39 // MediaStreamAudioDestinationNode periodically calls consumeAudio(). 38 // MediaStreamAudioDestinationNode periodically calls consumeAudio().
39 // Called on the WebAudio audio thread.
40 virtual void consumeAudio(const WebKit::WebVector<const float*>& audio_data, 40 virtual void consumeAudio(const WebKit::WebVector<const float*>& audio_data,
41 size_t number_of_frames) OVERRIDE; 41 size_t number_of_frames) OVERRIDE;
42 42
43 // AudioCapturerSource implementation. 43 // Called when the WebAudioCapturerSource is hooking to a media audio track.
44 virtual void Initialize( 44 // |track| is the sink of the data flow. |source_provider| is the source of
45 const media::AudioParameters& params, 45 // the data flow where stream information like delay, volume, key_pressed,
46 media::AudioCapturerSource::CaptureCallback* callback, 46 // is stored.
47 int session_id) OVERRIDE; 47 void Start(WebRtcLocalAudioTrack* track,
48 WebRtcLocalAudioSourceProvider* source_provider);
48 49
49 virtual void Start() OVERRIDE; 50 // Called when the media audio track is stopping.
50 virtual void Stop() OVERRIDE; 51 void Stop();
51 virtual void SetVolume(double volume) OVERRIDE { } 52
52 virtual void SetAutomaticGainControl(bool enable) OVERRIDE { } 53 protected:
54 friend class base::RefCountedThreadSafe<WebAudioCapturerSource>;
55 virtual ~WebAudioCapturerSource();
53 56
54 private: 57 private:
55 virtual ~WebAudioCapturerSource(); 58 // Used to DCHECK that some methods are called on the correct thread.
59 base::ThreadChecker thread_checker_;
56 60
57 WebRtcAudioCapturer* capturer_; 61 // The audio track this WebAudioCapturerSource is feeding data to.
62 // WebRtcLocalAudioTrack is reference counted, and owning this object.
63 // To avoid circular reference, a raw pointer is kept here.
64 WebRtcLocalAudioTrack* track_;
58 65
59 int set_format_channels_; 66 // A raw pointer to the source provider to get audio processing params like
67 // delay, volume, key_pressed information.
68 // This |source_provider_| is guaranteed to outlive this object.
69 WebRtcLocalAudioSourceProvider* source_provider_;
70
60 media::AudioParameters params_; 71 media::AudioParameters params_;
61 media::AudioCapturerSource::CaptureCallback* callback_;
62 72
63 // Wraps data coming from HandleCapture(). 73 // Wraps data coming from HandleCapture().
64 scoped_ptr<media::AudioBus> wrapper_bus_; 74 scoped_ptr<media::AudioBus> wrapper_bus_;
65 75
66 // Bus for reading from FIFO and calling the CaptureCallback. 76 // Bus for reading from FIFO and calling the CaptureCallback.
67 scoped_ptr<media::AudioBus> capture_bus_; 77 scoped_ptr<media::AudioBus> capture_bus_;
68 78
69 // Handles mismatch between WebAudio buffer size and WebRTC. 79 // Handles mismatch between WebAudio buffer size and WebRTC.
70 scoped_ptr<media::AudioFifo> fifo_; 80 scoped_ptr<media::AudioFifo> fifo_;
71 81
72 // Synchronizes HandleCapture() with AudioCapturerSource calls. 82 // Synchronizes HandleCapture() with AudioCapturerSource calls.
73 base::Lock lock_; 83 base::Lock lock_;
74 bool started_; 84 bool started_;
75 85
76 DISALLOW_COPY_AND_ASSIGN(WebAudioCapturerSource); 86 DISALLOW_COPY_AND_ASSIGN(WebAudioCapturerSource);
77 }; 87 };
78 88
79 } // namespace content 89 } // namespace content
80 90
81 #endif // CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_ 91 #endif // CONTENT_RENDERER_MEDIA_WEBAUDIO_CAPTURER_SOURCE_H_
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler_unittest.cc ('k') | content/renderer/media/webaudio_capturer_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698