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

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

Issue 2799563002: Replace usage of WebVector::isEmpty with WebVector::empty().
Patch Set: Created 3 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 unified diff | Download patch
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/video_track_to_pepper_adapter.h" 5 #include "content/renderer/media/video_track_to_pepper_adapter.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 : blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(GURL(url)); 104 : blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(GURL(url));
105 105
106 if (stream.isNull()) { 106 if (stream.isNull()) {
107 LOG(ERROR) << "GetFirstVideoSource - invalid url: " << url; 107 LOG(ERROR) << "GetFirstVideoSource - invalid url: " << url;
108 return blink::WebMediaStreamTrack(); 108 return blink::WebMediaStreamTrack();
109 } 109 }
110 110
111 // Get the first video track from the stream. 111 // Get the first video track from the stream.
112 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; 112 blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
113 stream.videoTracks(video_tracks); 113 stream.videoTracks(video_tracks);
114 if (video_tracks.isEmpty()) { 114 if (video_tracks.empty()) {
115 LOG(ERROR) << "GetFirstVideoSource - no video tracks. url: " << url; 115 LOG(ERROR) << "GetFirstVideoSource - no video tracks. url: " << url;
116 return blink::WebMediaStreamTrack(); 116 return blink::WebMediaStreamTrack();
117 } 117 }
118 118
119 return video_tracks[0]; 119 return video_tracks[0];
120 } 120 }
121 121
122 void VideoTrackToPepperAdapter::DeliverFrameForTesting( 122 void VideoTrackToPepperAdapter::DeliverFrameForTesting(
123 FrameReaderInterface* reader, 123 FrameReaderInterface* reader,
124 const scoped_refptr<media::VideoFrame>& frame) { 124 const scoped_refptr<media::VideoFrame>& frame) {
125 SourceInfoMap::const_iterator it = reader_to_receiver_.find(reader); 125 SourceInfoMap::const_iterator it = reader_to_receiver_.find(reader);
126 if (it == reader_to_receiver_.end()) 126 if (it == reader_to_receiver_.end())
127 return; 127 return;
128 PpFrameReceiver* receiver = it->second->receiver_.get(); 128 PpFrameReceiver* receiver = it->second->receiver_.get();
129 receiver->OnVideoFrame(frame, base::TimeTicks()); 129 receiver->OnVideoFrame(frame, base::TimeTicks());
130 } 130 }
131 131
132 VideoTrackToPepperAdapter::SourceInfo::SourceInfo( 132 VideoTrackToPepperAdapter::SourceInfo::SourceInfo(
133 const blink::WebMediaStreamTrack& blink_track, 133 const blink::WebMediaStreamTrack& blink_track,
134 FrameReaderInterface* reader) 134 FrameReaderInterface* reader)
135 : receiver_(new PpFrameReceiver(blink_track)) { 135 : receiver_(new PpFrameReceiver(blink_track)) {
136 receiver_->SetReader(reader); 136 receiver_->SetReader(reader);
137 } 137 }
138 138
139 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() { 139 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() {
140 receiver_->SetReader(NULL); 140 receiver_->SetReader(NULL);
141 } 141 }
142 142
143 } // namespace content 143 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/user_media_client_impl.cc ('k') | content/renderer/media_recorder/media_recorder_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698