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

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

Issue 195763008: Revert 255158 "Avoid hitting the thread check when WebRtcAudioRe..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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
« no previous file with comments | « no previous file | trunk/src/content/renderer/media/media_stream_audio_processor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 private: 109 private:
110 friend class MediaStreamAudioProcessorTest; 110 friend class MediaStreamAudioProcessorTest;
111 111
112 class MediaStreamAudioConverter; 112 class MediaStreamAudioConverter;
113 113
114 // WebRtcPlayoutDataSource::Sink implementation. 114 // WebRtcPlayoutDataSource::Sink implementation.
115 virtual void OnPlayoutData(media::AudioBus* audio_bus, 115 virtual void OnPlayoutData(media::AudioBus* audio_bus,
116 int sample_rate, 116 int sample_rate,
117 int audio_delay_milliseconds) OVERRIDE; 117 int audio_delay_milliseconds) OVERRIDE;
118 virtual void OnPlayoutDataSourceChanged() OVERRIDE;
119 118
120 // webrtc::AudioProcessorInterface implementation. 119 // webrtc::AudioProcessorInterface implementation.
121 // This method is called on the libjingle thread. 120 // This method is called on the libjingle thread.
122 virtual void GetStats(AudioProcessorStats* stats) OVERRIDE; 121 virtual void GetStats(AudioProcessorStats* stats) OVERRIDE;
123 122
124 // Helper to initialize the WebRtc AudioProcessing. 123 // Helper to initialize the WebRtc AudioProcessing.
125 void InitializeAudioProcessingModule( 124 void InitializeAudioProcessingModule(
126 const blink::WebMediaConstraints& constraints, int effects, 125 const blink::WebMediaConstraints& constraints, int effects,
127 MediaStreamType type); 126 MediaStreamType type);
128 127
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 189
191 // This flag is used to show the result of typing detection. 190 // This flag is used to show the result of typing detection.
192 // It can be accessed by the capture audio thread and by the libjingle thread 191 // It can be accessed by the capture audio thread and by the libjingle thread
193 // which calls GetStats(). 192 // which calls GetStats().
194 base::subtle::Atomic32 typing_detected_; 193 base::subtle::Atomic32 typing_detected_;
195 }; 194 };
196 195
197 } // namespace content 196 } // namespace content
198 197
199 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_ 198 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_PROCESSOR_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/content/renderer/media/media_stream_audio_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698