OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "content/renderer/media/remote_media_stream_impl.h" | 5 #include "content/renderer/media/remote_media_stream_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "content/renderer/media/media_stream_extra_data.h" | 11 #include "content/renderer/media/media_stream_extra_data.h" |
12 #include "third_party/WebKit/public/platform/WebString.h" | 12 #include "third_party/WebKit/public/platform/WebString.h" |
13 | 13 |
14 namespace content { | 14 namespace content { |
15 | 15 |
16 // RemoteMediaStreamTrackObserver is responsible for listening on change | 16 // RemoteMediaStreamTrackObserver is responsible for listening on change |
17 // notification on a remote webrtc MediaStreamTrack and notify WebKit. | 17 // notification on a remote webrtc MediaStreamTrack and notify WebKit. |
18 class RemoteMediaStreamTrackObserver | 18 class RemoteMediaStreamTrackObserver |
19 : NON_EXPORTED_BASE(public webrtc::ObserverInterface), | 19 : NON_EXPORTED_BASE(public webrtc::ObserverInterface), |
20 NON_EXPORTED_BASE(public base::NonThreadSafe) { | 20 NON_EXPORTED_BASE(public base::NonThreadSafe) { |
21 public: | 21 public: |
22 RemoteMediaStreamTrackObserver( | 22 RemoteMediaStreamTrackObserver( |
23 webrtc::MediaStreamTrackInterface* webrtc_track, | 23 webrtc::MediaStreamTrackInterface* webrtc_track, |
24 const WebKit::WebMediaStreamTrack& webkit_track); | 24 const WebKit::WebMediaStreamTrack& webkit_track); |
25 virtual ~RemoteMediaStreamTrackObserver(); | 25 virtual ~RemoteMediaStreamTrackObserver(); |
26 | 26 |
27 webrtc::MediaStreamTrackInterface* observered_track() { | 27 webrtc::MediaStreamTrackInterface* observered_track() { |
28 return webrtc_track_; | 28 return webrtc_track_.get(); |
29 } | 29 } |
30 const WebKit::WebMediaStreamTrack& webkit_track() { return webkit_track_; } | 30 const WebKit::WebMediaStreamTrack& webkit_track() { return webkit_track_; } |
31 | 31 |
32 private: | 32 private: |
33 // webrtc::ObserverInterface implementation. | 33 // webrtc::ObserverInterface implementation. |
34 virtual void OnChanged() OVERRIDE; | 34 virtual void OnChanged() OVERRIDE; |
35 | 35 |
36 webrtc::MediaStreamTrackInterface::TrackState state_; | 36 webrtc::MediaStreamTrackInterface::TrackState state_; |
37 scoped_refptr<webrtc::MediaStreamTrackInterface> webrtc_track_; | 37 scoped_refptr<webrtc::MediaStreamTrackInterface> webrtc_track_; |
38 WebKit::WebMediaStreamTrack webkit_track_; | 38 WebKit::WebMediaStreamTrack webkit_track_; |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 InitializeWebkitTrack(*it, &new_track, | 208 InitializeWebkitTrack(*it, &new_track, |
209 WebKit::WebMediaStreamSource::TypeVideo); | 209 WebKit::WebMediaStreamSource::TypeVideo); |
210 video_track_observers_.push_back( | 210 video_track_observers_.push_back( |
211 new RemoteMediaStreamTrackObserver(*it, new_track)); | 211 new RemoteMediaStreamTrackObserver(*it, new_track)); |
212 webkit_stream_.addTrack(new_track); | 212 webkit_stream_.addTrack(new_track); |
213 } | 213 } |
214 } | 214 } |
215 } | 215 } |
216 | 216 |
217 } // namespace content | 217 } // namespace content |
OLD | NEW |