| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/api/mediastreamobserver.h" | 11 #include "webrtc/pc/mediastreamobserver.h" |
| 12 | 12 |
| 13 #include <algorithm> | 13 #include <algorithm> |
| 14 | 14 |
| 15 namespace webrtc { | 15 namespace webrtc { |
| 16 | 16 |
| 17 MediaStreamObserver::MediaStreamObserver(MediaStreamInterface* stream) | 17 MediaStreamObserver::MediaStreamObserver(MediaStreamInterface* stream) |
| 18 : stream_(stream), | 18 : stream_(stream), |
| 19 cached_audio_tracks_(stream->GetAudioTracks()), | 19 cached_audio_tracks_(stream->GetAudioTracks()), |
| 20 cached_video_tracks_(stream->GetVideoTracks()) { | 20 cached_video_tracks_(stream->GetVideoTracks()) { |
| 21 stream_->RegisterObserver(this); | 21 stream_->RegisterObserver(this); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 if (it == cached_video_tracks_.end()) { | 75 if (it == cached_video_tracks_.end()) { |
| 76 SignalVideoTrackAdded(new_track.get(), stream_); | 76 SignalVideoTrackAdded(new_track.get(), stream_); |
| 77 } | 77 } |
| 78 } | 78 } |
| 79 | 79 |
| 80 cached_audio_tracks_ = new_audio_tracks; | 80 cached_audio_tracks_ = new_audio_tracks; |
| 81 cached_video_tracks_ = new_video_tracks; | 81 cached_video_tracks_ = new_video_tracks; |
| 82 } | 82 } |
| 83 | 83 |
| 84 } // namespace webrtc | 84 } // namespace webrtc |
| OLD | NEW |