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

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

Issue 2946063003: WebRtcMediaStreamAdapterMap added. (Closed)
Patch Set: Reupload from new machine so that dependent patch sets can be made Created 3 years, 6 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 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "content/renderer/media/media_stream_audio_track.h" 10 #include "content/renderer/media/media_stream_audio_track.h"
(...skipping 18 matching lines...) Expand all
29 web_stream_.AudioTracks(audio_tracks); 29 web_stream_.AudioTracks(audio_tracks);
30 for (blink::WebMediaStreamTrack& audio_track : audio_tracks) 30 for (blink::WebMediaStreamTrack& audio_track : audio_tracks)
31 TrackAdded(audio_track); 31 TrackAdded(audio_track);
32 32
33 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; 33 blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
34 web_stream_.VideoTracks(video_tracks); 34 web_stream_.VideoTracks(video_tracks);
35 for (blink::WebMediaStreamTrack& video_track : video_tracks) 35 for (blink::WebMediaStreamTrack& video_track : video_tracks)
36 TrackAdded(video_track); 36 TrackAdded(video_track);
37 37
38 MediaStream* const native_stream = MediaStream::GetMediaStream(web_stream_); 38 MediaStream* const native_stream = MediaStream::GetMediaStream(web_stream_);
39 DCHECK(native_stream);
39 native_stream->AddObserver(this); 40 native_stream->AddObserver(this);
40 } 41 }
41 42
42 WebRtcMediaStreamAdapter::~WebRtcMediaStreamAdapter() { 43 WebRtcMediaStreamAdapter::~WebRtcMediaStreamAdapter() {
43 MediaStream* const native_stream = MediaStream::GetMediaStream(web_stream_); 44 MediaStream* const native_stream = MediaStream::GetMediaStream(web_stream_);
44 native_stream->RemoveObserver(this); 45 native_stream->RemoveObserver(this);
45 46
46 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; 47 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
47 web_stream_.AudioTracks(audio_tracks); 48 web_stream_.AudioTracks(audio_tracks);
48 for (blink::WebMediaStreamTrack& audio_track : audio_tracks) 49 for (blink::WebMediaStreamTrack& audio_track : audio_tracks)
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 webrtc_media_stream_->RemoveTrack( 90 webrtc_media_stream_->RemoveTrack(
90 static_cast<webrtc::AudioTrackInterface*>(it->second->webrtc_track())); 91 static_cast<webrtc::AudioTrackInterface*>(it->second->webrtc_track()));
91 } else { 92 } else {
92 webrtc_media_stream_->RemoveTrack( 93 webrtc_media_stream_->RemoveTrack(
93 static_cast<webrtc::VideoTrackInterface*>(it->second->webrtc_track())); 94 static_cast<webrtc::VideoTrackInterface*>(it->second->webrtc_track()));
94 } 95 }
95 adapter_refs_.erase(it); 96 adapter_refs_.erase(it);
96 } 97 }
97 98
98 } // namespace content 99 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698