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

Side by Side Diff: talk/app/webrtc/videosource.cc

Issue 1342543004: Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 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
« no previous file with comments | « no previous file | talk/media/base/streamparams.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 311
312 // This signal will be made on media engine render thread. The clients 312 // This signal will be made on media engine render thread. The clients
313 // of this signal should have no assumptions on what thread this signal 313 // of this signal should have no assumptions on what thread this signal
314 // come from. 314 // come from.
315 capturer_->SignalVideoFrame(capturer_, frame); 315 capturer_->SignalVideoFrame(capturer_, frame);
316 return true; 316 return true;
317 } 317 }
318 318
319 private: 319 private:
320 cricket::VideoCapturer* capturer_; 320 cricket::VideoCapturer* capturer_;
321 int width_;
322 int height_;
323 321
324 RTC_DISALLOW_COPY_AND_ASSIGN(FrameInputWrapper); 322 RTC_DISALLOW_COPY_AND_ASSIGN(FrameInputWrapper);
325 }; 323 };
326 324
327 } // anonymous namespace 325 } // anonymous namespace
328 326
329 namespace webrtc { 327 namespace webrtc {
330 328
331 rtc::scoped_refptr<VideoSource> VideoSource::Create( 329 rtc::scoped_refptr<VideoSource> VideoSource::Create(
332 cricket::ChannelManager* channel_manager, 330 cricket::ChannelManager* channel_manager,
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 } 460 }
463 461
464 void VideoSource::SetState(SourceState new_state) { 462 void VideoSource::SetState(SourceState new_state) {
465 if (VERIFY(state_ != new_state)) { 463 if (VERIFY(state_ != new_state)) {
466 state_ = new_state; 464 state_ = new_state;
467 FireOnChanged(); 465 FireOnChanged();
468 } 466 }
469 } 467 }
470 468
471 } // namespace webrtc 469 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | talk/media/base/streamparams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698