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

Side by Side Diff: webrtc/test/vcm_capturer.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
« no previous file with comments | « webrtc/test/vcm_capturer.h ('k') | webrtc/test/video_capturer.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 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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/test/vcm_capturer.h" 11 #include "webrtc/test/vcm_capturer.h"
12 12
13 #include "webrtc/base/logging.h"
14 #include "webrtc/modules/video_capture/video_capture_factory.h" 13 #include "webrtc/modules/video_capture/video_capture_factory.h"
14 #include "webrtc/rtc_base/logging.h"
15 #include "webrtc/video_send_stream.h" 15 #include "webrtc/video_send_stream.h"
16 namespace webrtc { 16 namespace webrtc {
17 namespace test { 17 namespace test {
18 18
19 VcmCapturer::VcmCapturer() : started_(false), sink_(nullptr), vcm_(nullptr) {} 19 VcmCapturer::VcmCapturer() : started_(false), sink_(nullptr), vcm_(nullptr) {}
20 20
21 bool VcmCapturer::Init(size_t width, 21 bool VcmCapturer::Init(size_t width,
22 size_t height, 22 size_t height,
23 size_t target_fps, 23 size_t target_fps,
24 size_t capture_device_index) { 24 size_t capture_device_index) {
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 rtc::CritScope lock(&crit_); 108 rtc::CritScope lock(&crit_);
109 if (started_ && sink_) { 109 if (started_ && sink_) {
110 rtc::Optional<VideoFrame> out_frame = AdaptFrame(frame); 110 rtc::Optional<VideoFrame> out_frame = AdaptFrame(frame);
111 if (out_frame) 111 if (out_frame)
112 sink_->OnFrame(*out_frame); 112 sink_->OnFrame(*out_frame);
113 } 113 }
114 } 114 }
115 115
116 } // test 116 } // test
117 } // webrtc 117 } // webrtc
OLDNEW
« no previous file with comments | « webrtc/test/vcm_capturer.h ('k') | webrtc/test/video_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698