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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/peer_connection_handler_base.h" 5 #include "content/renderer/media/peer_connection_handler_base.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/renderer/media/media_stream_dependency_factory.h" 9 #include "content/renderer/media/media_stream_dependency_factory.h"
10 #include "content/renderer/media/media_stream_extra_data.h" 10 #include "content/renderer/media/media_stream_extra_data.h"
11 #include "third_party/WebKit/public/platform/WebMediaStream.h" 11 #include "third_party/WebKit/public/platform/WebMediaStream.h"
12 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 12 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
13 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 13 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
14 #include "third_party/WebKit/public/platform/WebString.h" 14 #include "third_party/WebKit/public/platform/WebString.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 // TODO(hta): Unify implementations of these functions from MediaStreamCenter 18 // TODO(hta): Unify implementations of these functions from MediaStreamCenter
19 static webrtc::MediaStreamInterface* GetNativeMediaStream( 19 static webrtc::MediaStreamInterface* GetNativeMediaStream(
20 const WebKit::WebMediaStream& stream) { 20 const WebKit::WebMediaStream& stream) {
21 MediaStreamExtraData* extra_data = 21 MediaStreamExtraData* extra_data =
22 static_cast<MediaStreamExtraData*>(stream.extraData()); 22 static_cast<MediaStreamExtraData*>(stream.extraData());
23 if (extra_data) 23 if (extra_data)
24 return extra_data->stream(); 24 return extra_data->stream().get();
25 return NULL; 25 return NULL;
26 } 26 }
27 27
28 PeerConnectionHandlerBase::PeerConnectionHandlerBase( 28 PeerConnectionHandlerBase::PeerConnectionHandlerBase(
29 MediaStreamDependencyFactory* dependency_factory) 29 MediaStreamDependencyFactory* dependency_factory)
30 : dependency_factory_(dependency_factory), 30 : dependency_factory_(dependency_factory),
31 message_loop_proxy_(base::MessageLoopProxy::current()) { 31 message_loop_proxy_(base::MessageLoopProxy::current()) {
32 } 32 }
33 33
34 PeerConnectionHandlerBase::~PeerConnectionHandlerBase() { 34 PeerConnectionHandlerBase::~PeerConnectionHandlerBase() {
(...skipping 29 matching lines...) Expand all
64 return native_stream->FindAudioTrack(track_id); 64 return native_stream->FindAudioTrack(track_id);
65 } 65 }
66 if (track.source().type() == WebKit::WebMediaStreamSource::TypeVideo) { 66 if (track.source().type() == WebKit::WebMediaStreamSource::TypeVideo) {
67 return native_stream->FindVideoTrack(track_id); 67 return native_stream->FindVideoTrack(track_id);
68 } 68 }
69 NOTIMPLEMENTED(); // We have an unknown type of media stream track. 69 NOTIMPLEMENTED(); // We have an unknown type of media stream track.
70 return NULL; 70 return NULL;
71 } 71 }
72 72
73 } // namespace content 73 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/mock_media_stream_registry.cc ('k') | content/renderer/media/remote_media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698