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

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

Issue 1856673002: Mojofication of the Chrome Audio Rendering Prototype Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_MEDIA_STREAM_AUDIO_PROCESSOR_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_
7 7
8 #include "base/atomicops.h" 8 #include "base/atomicops.h"
9 #include "base/files/file.h" 9 #include "base/files/file.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "base/threading/thread_checker.h" 13 #include "base/threading/thread_checker.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "content/renderer/media/audio_output_client.h"
16 #include "content/public/common/media_stream_request.h" 17 #include "content/public/common/media_stream_request.h"
17 #include "content/renderer/media/aec_dump_message_filter.h" 18 #include "content/renderer/media/aec_dump_message_filter.h"
18 #include "content/renderer/media/audio_repetition_detector.h" 19 #include "content/renderer/media/audio_repetition_detector.h"
19 #include "content/renderer/media/webrtc_audio_device_impl.h" 20 #include "content/renderer/media/webrtc_audio_device_impl.h"
20 #include "media/base/audio_converter.h" 21 #include "media/base/audio_converter.h"
21 #include "third_party/webrtc/api/mediastreaminterface.h" 22 #include "third_party/webrtc/api/mediastreaminterface.h"
22 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h " 23 #include "third_party/webrtc/modules/audio_processing/include/audio_processing.h "
23 24
24 namespace blink { 25 namespace blink {
25 class WebMediaConstraints; 26 class WebMediaConstraints;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 scoped_ptr<AudioRepetitionDetector> audio_repetition_detector_; 161 scoped_ptr<AudioRepetitionDetector> audio_repetition_detector_;
161 162
162 // Module to handle processing and format conversion. 163 // Module to handle processing and format conversion.
163 scoped_ptr<webrtc::AudioProcessing> audio_processing_; 164 scoped_ptr<webrtc::AudioProcessing> audio_processing_;
164 165
165 // FIFO to provide 10 ms capture chunks. 166 // FIFO to provide 10 ms capture chunks.
166 scoped_ptr<MediaStreamAudioFifo> capture_fifo_; 167 scoped_ptr<MediaStreamAudioFifo> capture_fifo_;
167 // Receives processing output. 168 // Receives processing output.
168 scoped_ptr<MediaStreamAudioBus> output_bus_; 169 scoped_ptr<MediaStreamAudioBus> output_bus_;
169 170
171 AudioOutputClient* audio_output_client_;
172
170 // FIFO to provide 10 ms render chunks when the AEC is enabled. 173 // FIFO to provide 10 ms render chunks when the AEC is enabled.
171 scoped_ptr<MediaStreamAudioFifo> render_fifo_; 174 scoped_ptr<MediaStreamAudioFifo> render_fifo_;
172 175
173 // These are mutated on the main render thread in OnCaptureFormatChanged(). 176 // These are mutated on the main render thread in OnCaptureFormatChanged().
174 // The caller guarantees this does not run concurrently with accesses on the 177 // The caller guarantees this does not run concurrently with accesses on the
175 // capture audio thread. 178 // capture audio thread.
176 media::AudioParameters input_format_; 179 media::AudioParameters input_format_;
177 media::AudioParameters output_format_; 180 media::AudioParameters output_format_;
178 // Only used on the render audio thread. 181 // Only used on the render audio thread.
179 media::AudioParameters render_format_; 182 media::AudioParameters render_format_;
(...skipping 27 matching lines...) Expand all
207 // Object for logging echo information when the AEC is enabled. Accessible by 210 // Object for logging echo information when the AEC is enabled. Accessible by
208 // the libjingle thread through GetStats(). 211 // the libjingle thread through GetStats().
209 scoped_ptr<EchoInformation> echo_information_; 212 scoped_ptr<EchoInformation> echo_information_;
210 213
211 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioProcessor); 214 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioProcessor);
212 }; 215 };
213 216
214 } // namespace content 217 } // namespace content
215 218
216 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_ 219 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_
OLDNEW
« no previous file with comments | « content/renderer/media/audio_output_client.cc ('k') | content/renderer/pepper/pepper_platform_audio_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698