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

Side by Side Diff: trunk/src/content/renderer/media/media_stream_video_source.cc

Issue 231963002: Revert 262050 "Implement a source for remote video tracks." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
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/media_stream_video_source.h" 5 #include "content/renderer/media/media_stream_video_source.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 10
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 return true; 301 return true;
302 } 302 }
303 return false; 303 return false;
304 } 304 }
305 305
306 MediaStreamVideoSource::MediaStreamVideoSource( 306 MediaStreamVideoSource::MediaStreamVideoSource(
307 MediaStreamDependencyFactory* factory) 307 MediaStreamDependencyFactory* factory)
308 : state_(NEW), 308 : state_(NEW),
309 factory_(factory), 309 factory_(factory),
310 capture_adapter_(NULL) { 310 capture_adapter_(NULL) {
311 DCHECK(factory_);
311 } 312 }
312 313
313 MediaStreamVideoSource::~MediaStreamVideoSource() { 314 MediaStreamVideoSource::~MediaStreamVideoSource() {
314 } 315 }
315 316
316 void MediaStreamVideoSource::AddTrack( 317 void MediaStreamVideoSource::AddTrack(
317 MediaStreamVideoTrack* track, 318 MediaStreamVideoTrack* track,
318 const blink::WebMediaConstraints& constraints, 319 const blink::WebMediaConstraints& constraints,
319 const ConstraintsCallback& callback) { 320 const ConstraintsCallback& callback) {
320 DCHECK(CalledOnValidThread()); 321 DCHECK(CalledOnValidThread());
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 MediaStreamVideoSource::RequestedConstraints::RequestedConstraints( 530 MediaStreamVideoSource::RequestedConstraints::RequestedConstraints(
530 const blink::WebMediaConstraints& constraints, 531 const blink::WebMediaConstraints& constraints,
531 const ConstraintsCallback& callback) 532 const ConstraintsCallback& callback)
532 : constraints(constraints), callback(callback) { 533 : constraints(constraints), callback(callback) {
533 } 534 }
534 535
535 MediaStreamVideoSource::RequestedConstraints::~RequestedConstraints() { 536 MediaStreamVideoSource::RequestedConstraints::~RequestedConstraints() {
536 } 537 }
537 538
538 } // namespace content 539 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698