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

Side by Side Diff: content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "base/threading/thread_checker.h" 14 #include "base/threading/thread_checker.h"
15 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
16 #include "third_party/libjingle/source/talk/app/webrtc/mediastreamtrack.h" 16 #include "third_party/webrtc/api/mediastreamtrack.h"
17 #include "third_party/webrtc/media/base/audiorenderer.h" 17 #include "third_party/webrtc/media/base/audiorenderer.h"
18 18
19 namespace cricket { 19 namespace cricket {
20 class AudioRenderer; 20 class AudioRenderer;
21 } 21 }
22 22
23 namespace webrtc { 23 namespace webrtc {
24 class AudioSourceInterface; 24 class AudioSourceInterface;
25 class AudioProcessorInterface; 25 class AudioProcessorInterface;
26 } 26 }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 base::ThreadChecker signaling_thread_checker_; 100 base::ThreadChecker signaling_thread_checker_;
101 base::ThreadChecker capture_thread_; 101 base::ThreadChecker capture_thread_;
102 102
103 // Protects |voe_channels_|, |audio_processor_| and |signal_level_|. 103 // Protects |voe_channels_|, |audio_processor_| and |signal_level_|.
104 mutable base::Lock lock_; 104 mutable base::Lock lock_;
105 }; 105 };
106 106
107 } // namespace content 107 } // namespace content
108 108
109 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_ 109 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_LOCAL_AUDIO_TRACK_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698