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

Side by Side Diff: webrtc/media/engine/webrtcvideocapturer.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/media/engine/webrtcvideocapturer.h" 11 #include "webrtc/media/engine/webrtcvideocapturer.h"
12 12
13 #include "webrtc/base/arraysize.h" 13 #include "webrtc/rtc_base/arraysize.h"
14 #include "webrtc/base/bind.h" 14 #include "webrtc/rtc_base/bind.h"
15 #include "webrtc/base/checks.h" 15 #include "webrtc/rtc_base/checks.h"
16 #include "webrtc/base/criticalsection.h" 16 #include "webrtc/rtc_base/criticalsection.h"
17 #include "webrtc/base/logging.h" 17 #include "webrtc/rtc_base/logging.h"
18 #include "webrtc/base/safe_conversions.h" 18 #include "webrtc/rtc_base/safe_conversions.h"
19 #include "webrtc/base/thread.h" 19 #include "webrtc/rtc_base/thread.h"
20 #include "webrtc/base/timeutils.h" 20 #include "webrtc/rtc_base/timeutils.h"
21 21
22 #include "webrtc/base/win32.h" // Need this to #include the impl files.
23 #include "webrtc/modules/video_capture/video_capture_factory.h" 22 #include "webrtc/modules/video_capture/video_capture_factory.h"
23 #include "webrtc/rtc_base/win32.h" // Need this to #include the impl files.
24 #include "webrtc/system_wrappers/include/field_trial.h" 24 #include "webrtc/system_wrappers/include/field_trial.h"
25 25
26 namespace cricket { 26 namespace cricket {
27 27
28 namespace { 28 namespace {
29 struct kVideoFourCCEntry { 29 struct kVideoFourCCEntry {
30 uint32_t fourcc; 30 uint32_t fourcc;
31 webrtc::VideoType webrtc_type; 31 webrtc::VideoType webrtc_type;
32 }; 32 };
33 33
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 if (1 == captured_frames_) { 344 if (1 == captured_frames_) {
345 LOG(LS_INFO) << "Captured frame size " 345 LOG(LS_INFO) << "Captured frame size "
346 << sample.width() << "x" << sample.height() 346 << sample.width() << "x" << sample.height()
347 << ". Expected format " << GetCaptureFormat()->ToString(); 347 << ". Expected format " << GetCaptureFormat()->ToString();
348 } 348 }
349 349
350 VideoCapturer::OnFrame(sample, sample.width(), sample.height()); 350 VideoCapturer::OnFrame(sample, sample.width(), sample.height());
351 } 351 }
352 352
353 } // namespace cricket 353 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideocapturer.h ('k') | webrtc/media/engine/webrtcvideocapturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698