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

Side by Side Diff: webrtc/modules/video_capture/test/video_capture_unittest.cc

Issue 2517173004: Move VideoFrame and related declarations to webrtc/api/video. (Closed)
Patch Set: Make rotation check clearer. Created 3 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 <stdio.h> 11 #include <stdio.h>
12 12
13 #include <map> 13 #include <map>
14 #include <memory> 14 #include <memory>
15 #include <sstream> 15 #include <sstream>
16 16
17 #include "webrtc/api/video/i420_buffer.h"
18 #include "webrtc/api/video/video_frame.h"
17 #include "webrtc/base/scoped_ref_ptr.h" 19 #include "webrtc/base/scoped_ref_ptr.h"
18 #include "webrtc/base/timeutils.h" 20 #include "webrtc/base/timeutils.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 21 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/modules/utility/include/process_thread.h" 22 #include "webrtc/modules/utility/include/process_thread.h"
21 #include "webrtc/modules/video_capture/video_capture.h" 23 #include "webrtc/modules/video_capture/video_capture.h"
22 #include "webrtc/modules/video_capture/video_capture_factory.h" 24 #include "webrtc/modules/video_capture/video_capture_factory.h"
23 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 25 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
24 #include "webrtc/system_wrappers/include/sleep.h" 26 #include "webrtc/system_wrappers/include/sleep.h"
25 #include "webrtc/test/frame_utils.h" 27 #include "webrtc/test/frame_utils.h"
26 #include "webrtc/test/gtest.h" 28 #include "webrtc/test/gtest.h"
27 #include "webrtc/video_frame.h"
28 29
29 using webrtc::CriticalSectionWrapper; 30 using webrtc::CriticalSectionWrapper;
30 using webrtc::CriticalSectionScoped; 31 using webrtc::CriticalSectionScoped;
31 using webrtc::SleepMs; 32 using webrtc::SleepMs;
32 using webrtc::VideoCaptureCapability; 33 using webrtc::VideoCaptureCapability;
33 using webrtc::VideoCaptureFactory; 34 using webrtc::VideoCaptureFactory;
34 using webrtc::VideoCaptureModule; 35 using webrtc::VideoCaptureModule;
35 36
36 37
37 #define WAIT_(ex, timeout, res) \ 38 #define WAIT_(ex, timeout, res) \
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 length, capture_callback_.capability(), 0)); 418 length, capture_callback_.capability(), 0));
418 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_180)); 419 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_180));
419 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_180); 420 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_180);
420 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(), 421 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
421 length, capture_callback_.capability(), 0)); 422 length, capture_callback_.capability(), 0));
422 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_270)); 423 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_270));
423 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_270); 424 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_270);
424 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(), 425 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
425 length, capture_callback_.capability(), 0)); 426 length, capture_callback_.capability(), 0));
426 } 427 }
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h ('k') | webrtc/modules/video_capture/video_capture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698