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

Side by Side Diff: webrtc/video/video_capture_input_unittest.cc

Issue 1613053003: Swap use of CriticalSectionWrapper for rtc::CriticalSection in webrtc/video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 #include "webrtc/video/video_capture_input.h" 10 #include "webrtc/video/video_capture_input.h"
11 11
12 #include <vector> 12 #include <vector>
13 13
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webrtc/base/event.h" 16 #include "webrtc/base/event.h"
17 #include "webrtc/base/scoped_ptr.h" 17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/modules/utility/include/mock/mock_process_thread.h" 18 #include "webrtc/modules/utility/include/mock/mock_process_thread.h"
19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
20 #include "webrtc/system_wrappers/include/ref_count.h" 19 #include "webrtc/system_wrappers/include/ref_count.h"
21 #include "webrtc/system_wrappers/include/scoped_vector.h" 20 #include "webrtc/system_wrappers/include/scoped_vector.h"
22 #include "webrtc/test/fake_texture_frame.h" 21 #include "webrtc/test/fake_texture_frame.h"
23 #include "webrtc/video/send_statistics_proxy.h" 22 #include "webrtc/video/send_statistics_proxy.h"
24 23
25 using ::testing::_; 24 using ::testing::_;
26 using ::testing::Invoke; 25 using ::testing::Invoke;
27 using ::testing::NiceMock; 26 using ::testing::NiceMock;
28 using ::testing::Return; 27 using ::testing::Return;
29 using ::testing::WithArg; 28 using ::testing::WithArg;
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 const int kSizeY = width * height * 2; 293 const int kSizeY = width * height * 2;
295 uint8_t buffer[kSizeY]; 294 uint8_t buffer[kSizeY];
296 memset(buffer, data, kSizeY); 295 memset(buffer, data, kSizeY);
297 frame->CreateFrame(buffer, buffer, buffer, width, height, width, width / 2, 296 frame->CreateFrame(buffer, buffer, buffer, width, height, width, width / 2,
298 width / 2); 297 width / 2);
299 frame->set_render_time_ms(data); 298 frame->set_render_time_ms(data);
300 return frame; 299 return frame;
301 } 300 }
302 301
303 } // namespace webrtc 302 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698