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

Side by Side Diff: content/renderer/media/remote_media_stream_impl.cc

Issue 90743004: Add generic interfaces for the sinks of the media stream audio track (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added a DCHECK(other) and rebased Created 7 years 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 | Annotate | Revision Log
OLDNEW
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/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 namespace { 46 namespace {
47 47
48 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track, 48 void InitializeWebkitTrack(webrtc::MediaStreamTrackInterface* track,
49 blink::WebMediaStreamTrack* webkit_track, 49 blink::WebMediaStreamTrack* webkit_track,
50 blink::WebMediaStreamSource::Type type) { 50 blink::WebMediaStreamSource::Type type) {
51 blink::WebMediaStreamSource webkit_source; 51 blink::WebMediaStreamSource webkit_source;
52 blink::WebString webkit_track_id(UTF8ToUTF16(track->id())); 52 blink::WebString webkit_track_id(UTF8ToUTF16(track->id()));
53 53
54 webkit_source.initialize(webkit_track_id, type, webkit_track_id); 54 webkit_source.initialize(webkit_track_id, type, webkit_track_id);
55 webkit_track->initialize(webkit_track_id, webkit_source); 55 webkit_track->initialize(webkit_track_id, webkit_source);
56 content::MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(track, 56 content::MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(
57 *webkit_track); 57 track, *webkit_track, false);
58 } 58 }
59 59
60 content::RemoteMediaStreamTrackObserver* FindTrackObserver( 60 content::RemoteMediaStreamTrackObserver* FindTrackObserver(
61 webrtc::MediaStreamTrackInterface* track, 61 webrtc::MediaStreamTrackInterface* track,
62 const ScopedVector<content::RemoteMediaStreamTrackObserver>& observers) { 62 const ScopedVector<content::RemoteMediaStreamTrackObserver>& observers) {
63 ScopedVector<content::RemoteMediaStreamTrackObserver>::const_iterator it = 63 ScopedVector<content::RemoteMediaStreamTrackObserver>::const_iterator it =
64 observers.begin(); 64 observers.begin();
65 for (; it != observers.end(); ++it) { 65 for (; it != observers.end(); ++it) {
66 if ((*it)->observered_track() == track) 66 if ((*it)->observered_track() == track)
67 return *it; 67 return *it;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 InitializeWebkitTrack(*it, &new_track, 211 InitializeWebkitTrack(*it, &new_track,
212 blink::WebMediaStreamSource::TypeVideo); 212 blink::WebMediaStreamSource::TypeVideo);
213 video_track_observers_.push_back( 213 video_track_observers_.push_back(
214 new RemoteMediaStreamTrackObserver(*it, new_track)); 214 new RemoteMediaStreamTrackObserver(*it, new_track));
215 webkit_stream_.addTrack(new_track); 215 webkit_stream_.addTrack(new_track);
216 } 216 }
217 } 217 }
218 } 218 }
219 219
220 } // namespace content 220 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698