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

Unified Diff: content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h

Issue 675013005: Split libjingle's signaling thread from the UI thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase after landing data channel change Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h
diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h
index e183ebafca7ec04b9bb523995daca3ebf0ffb9e3..266c5f7f3dc70f569bf0dcc4453567228c7bb7e5 100644
--- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h
+++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h
@@ -9,6 +9,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
+#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
@@ -41,7 +42,8 @@ class CONTENT_EXPORT WebRtcLocalAudioTrackAdapter
WebRtcLocalAudioTrackAdapter(
const std::string& label,
- webrtc::AudioSourceInterface* track_source);
+ webrtc::AudioSourceInterface* track_source,
+ const scoped_refptr<base::SingleThreadTaskRunner>& signaling_thread);
~WebRtcLocalAudioTrackAdapter() override;
@@ -63,6 +65,7 @@ class CONTENT_EXPORT WebRtcLocalAudioTrackAdapter
private:
// webrtc::MediaStreamTrack implementation.
std::string kind() const override;
+ bool set_enabled(bool enable) override;
// webrtc::AudioTrackInterface implementation.
void AddSink(webrtc::AudioTrackSinkInterface* sink) override;
@@ -86,6 +89,9 @@ class CONTENT_EXPORT WebRtcLocalAudioTrackAdapter
// TODO(xians): merge |track_source_| to |capturer_| in WebRtcLocalAudioTrack.
rtc::scoped_refptr<webrtc::AudioSourceInterface> track_source_;
+ // Libjingle's signaling thread.
+ const scoped_refptr<base::SingleThreadTaskRunner> signaling_thread_;
+
// The audio processsor that applies audio processing on the data of audio
// track.
scoped_refptr<MediaStreamAudioProcessor> audio_processor_;
@@ -101,7 +107,7 @@ class CONTENT_EXPORT WebRtcLocalAudioTrackAdapter
int signal_level_;
// Thread checker for libjingle's signaling thread.
- base::ThreadChecker signaling_thread_;
+ base::ThreadChecker signaling_thread_checker_;
base::ThreadChecker capture_thread_;
// Protects |voe_channels_|, |audio_processor_| and |signal_level_|.

Powered by Google App Engine
This is Rietveld 408576698