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

Unified Diff: content/renderer/media/peer_connection_handler_base.cc

Issue 14200016: Added implementation of RemoteMediaStreams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/peer_connection_handler_base.cc
diff --git a/content/renderer/media/peer_connection_handler_base.cc b/content/renderer/media/peer_connection_handler_base.cc
index 1854a99361055c7c42dd35a88513203925d57d34..24585e0f8e868dc60c8473b743114e1a24f2a8c4 100644
--- a/content/renderer/media/peer_connection_handler_base.cc
+++ b/content/renderer/media/peer_connection_handler_base.cc
@@ -51,43 +51,6 @@ void PeerConnectionHandlerBase::RemoveStream(
DCHECK(native_stream);
}
-WebKit::WebMediaStream
-PeerConnectionHandlerBase::CreateRemoteWebKitMediaStream(
- webrtc::MediaStreamInterface* stream) {
- webrtc::AudioTrackVector audio_tracks = stream->GetAudioTracks();
- webrtc::VideoTrackVector video_tracks = stream->GetVideoTracks();
- WebKit::WebVector<WebKit::WebMediaStreamSource> audio_source_vector(
- audio_tracks.size());
- WebKit::WebVector<WebKit::WebMediaStreamSource> video_source_vector(
- video_tracks.size());
-
- // Add audio tracks.
- size_t i = 0;
- for (; i < audio_tracks.size(); ++i) {
- webrtc::AudioTrackInterface* audio_track = audio_tracks[i];
- DCHECK(audio_track);
- audio_source_vector[i].initialize(
- UTF8ToUTF16(audio_track->id()),
- WebKit::WebMediaStreamSource::TypeAudio,
- UTF8ToUTF16(audio_track->id()));
- }
-
- // Add video tracks.
- for (i = 0; i < video_tracks.size(); ++i) {
- webrtc::VideoTrackInterface* video_track = video_tracks[i];
- DCHECK(video_track);
- video_source_vector[i].initialize(
- UTF8ToUTF16(video_track->id()),
- WebKit::WebMediaStreamSource::TypeVideo,
- UTF8ToUTF16(video_track->id()));
- }
- WebKit::WebMediaStream descriptor;
- descriptor.initialize(UTF8ToUTF16(stream->label()),
- audio_source_vector, video_source_vector);
- descriptor.setExtraData(new MediaStreamExtraData(stream, false));
- return descriptor;
-}
-
webrtc::MediaStreamTrackInterface*
PeerConnectionHandlerBase::GetNativeMediaStreamTrack(
const WebKit::WebMediaStream& stream,

Powered by Google App Engine
This is Rietveld 408576698