Chromium Code Reviews| Index: content/renderer/media/media_stream_dependency_factory.h |
| diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h |
| index a56177ac08781dfc9a1d30f7967bf06edad4b131..930b4974945c53f79400adb76d89ed3a1d6c9b23 100644 |
| --- a/content/renderer/media/media_stream_dependency_factory.h |
| +++ b/content/renderer/media/media_stream_dependency_factory.h |
| @@ -46,6 +46,10 @@ class VideoCaptureImplManager; |
| class WebRtcAudioDeviceImpl; |
| struct StreamDeviceInfo; |
| +#if defined(GOOGLE_TV) |
| +class RTCVideoDecoderFactoryTv; |
| +#endif |
| + |
| // Object factory for RTC MediaStreams and RTC PeerConnections. |
| class CONTENT_EXPORT MediaStreamDependencyFactory |
| : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
| @@ -134,6 +138,10 @@ class CONTENT_EXPORT MediaStreamDependencyFactory |
| // own source. |
| void StopLocalAudioSource(const WebKit::WebMediaStream& description); |
| +#if defined(GOOGLE_TV) |
| + RTCVideoDecoderFactoryTv* decoder_factory_tv() { return decoder_factory_tv_; } |
| +#endif |
| + |
| protected: |
| // Asks the PeerConnection factory to create a Local MediaStream object. |
| virtual scoped_refptr<webrtc::MediaStreamInterface> |
| @@ -201,6 +209,12 @@ class CONTENT_EXPORT MediaStreamDependencyFactory |
| scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_; |
| +#if defined(GOOGLE_TV) |
| + // |pc_factory_| will hold the ownership of this object, and |pc_factory_| |
| + // outlives this object. Thus weak pointer is sufficient. |
|
ycheo (away)
2013/05/14 13:28:09
weak pointer?
wonsik
2013/05/14 14:18:55
raw pointer is considered weak.
|
| + RTCVideoDecoderFactoryTv* decoder_factory_tv_; |
| +#endif |
| + |
| scoped_refptr<VideoCaptureImplManager> vc_manager_; |
| scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_; |
| scoped_refptr<WebRtcAudioDeviceImpl> audio_device_; |