generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Disable video_capture_tests for Android." (revision 7023).

Browse Source 
BUG=3768
R=glaznev@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/25559004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7210 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andresp@webrtc.org 2014-09-17 11:56:25 +00:00
parent a74eda1b6f
commit 3bd5603b18
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/modules/video_capture/test/video_capture_unittest.cc
View File

@ -278,8 +278,7 @@ class VideoCaptureTest : public testing::Test {
unsigned int number_of_devices_;
};
// Video capture tests broken on Android, see webrtc:3768.
TEST_F(VideoCaptureTest, DISABLED_ON_ANDROID(CreateDelete)) {
TEST_F(VideoCaptureTest, CreateDelete) {
for (int i = 0; i < 5; ++i) {
int64_t start_time = TickTime::MillisecondTimestamp();
TestVideoCaptureCallback capture_observer;
@ -316,8 +315,7 @@ TEST_F(VideoCaptureTest, DISABLED_ON_ANDROID(CreateDelete)) {
}
}
// Video capture tests broken on Android, see webrtc:3768.
TEST_F(VideoCaptureTest, DISABLED_ON_ANDROID(Capabilities)) {
TEST_F(VideoCaptureTest, Capabilities) {
#ifdef WEBRTC_MAC
printf("Video capture capabilities are not supported on Mac.\n");
return;
@ -472,8 +470,7 @@ class VideoCaptureExternalTest : public testing::Test {
};
// Test input of external video frames.
// Video capture tests broken on Android, see webrtc:3768.
TEST_F(VideoCaptureExternalTest, DISABLED_ON_ANDROID(TestExternalCapture)) {
TEST_F(VideoCaptureExternalTest, TestExternalCapture) {
unsigned int length = webrtc::CalcBufferSize(webrtc::kI420,
test_frame_.width(),
test_frame_.height());
@ -555,13 +552,7 @@ TEST_F(VideoCaptureExternalTest, DISABLED_TestExternalCaptureI420) {
// Test frame rate and no picture alarm.
// Flaky on Win32, see webrtc:3270.
// Video capture tests broken on Android, see webrtc:3768.
#if defined(_WIN32) || defined(WEBRTC_ANDROID)
#define MAYBE_FrameRate DISABLED_FrameRate
#else
#define MAYBE_FrameRate FrameRate
#endif
TEST_F(VideoCaptureExternalTest, MAYBE_FrameRate) {
TEST_F(VideoCaptureExternalTest, DISABLED_ON_WIN(FrameRate)) {
int64_t testTime = 3;
TickTime startTime = TickTime::Now();
@ -598,8 +589,7 @@ TEST_F(VideoCaptureExternalTest, MAYBE_FrameRate) {
capture_feedback_.frame_rate() <= 33);
}
// Video capture tests broken on Android, see webrtc:3768.
TEST_F(VideoCaptureExternalTest, DISABLED_ON_ANDROID(Rotation)) {
TEST_F(VideoCaptureExternalTest, Rotation) {
EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kCameraRotate0));
unsigned int length = webrtc::CalcBufferSize(webrtc::kI420,
test_frame_.width(),
@ -621,8 +611,3 @@ TEST_F(VideoCaptureExternalTest, DISABLED_ON_ANDROID(Rotation)) {
EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
length, capture_callback_.capability(), 0));
}
// Video capture tests broken on Android, see webrtc:3768.
// Add dummy test that always passes to avoid the entire test returning exit
// code 1 when zero tests have executed.
TEST_F(VideoCaptureExternalTest, Dummy) {}