OLD | NEW |
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_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 const std::string& sdp); | 141 const std::string& sdp); |
142 | 142 |
143 WebRtcAudioDeviceImpl* GetWebRtcAudioDevice(); | 143 WebRtcAudioDeviceImpl* GetWebRtcAudioDevice(); |
144 | 144 |
145 #if defined(GOOGLE_TV) | 145 #if defined(GOOGLE_TV) |
146 RTCVideoDecoderFactoryTv* decoder_factory_tv() { return decoder_factory_tv_; } | 146 RTCVideoDecoderFactoryTv* decoder_factory_tv() { return decoder_factory_tv_; } |
147 #endif | 147 #endif |
148 | 148 |
149 static void AddNativeTrackToBlinkTrack( | 149 static void AddNativeTrackToBlinkTrack( |
150 webrtc::MediaStreamTrackInterface* native_track, | 150 webrtc::MediaStreamTrackInterface* native_track, |
151 const blink::WebMediaStreamTrack& webkit_track); | 151 const blink::WebMediaStreamTrack& webkit_track, |
| 152 bool is_local_track); |
152 | 153 |
153 static webrtc::MediaStreamInterface* GetNativeMediaStream( | 154 static webrtc::MediaStreamInterface* GetNativeMediaStream( |
154 const blink::WebMediaStream& stream); | 155 const blink::WebMediaStream& stream); |
155 | 156 |
156 static webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack( | 157 static webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack( |
157 const blink::WebMediaStreamTrack& track); | 158 const blink::WebMediaStreamTrack& track); |
158 | 159 |
159 protected: | 160 protected: |
160 // Asks the PeerConnection factory to create a Local MediaStream object. | 161 // Asks the PeerConnection factory to create a Local MediaStream object. |
161 virtual scoped_refptr<webrtc::MediaStreamInterface> | 162 virtual scoped_refptr<webrtc::MediaStreamInterface> |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 talk_base::Thread* signaling_thread_; | 252 talk_base::Thread* signaling_thread_; |
252 talk_base::Thread* worker_thread_; | 253 talk_base::Thread* worker_thread_; |
253 base::Thread chrome_worker_thread_; | 254 base::Thread chrome_worker_thread_; |
254 | 255 |
255 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); | 256 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); |
256 }; | 257 }; |
257 | 258 |
258 } // namespace content | 259 } // namespace content |
259 | 260 |
260 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 261 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |
OLD | NEW |