From 641587f9381fbac599af5c844b39090a8e93388b Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Tue, 24 Sep 2013 18:43:28 +0000
Subject: [PATCH] Disable some VP8 tests on Android.

DecodeWithACompleteKeyFrame and FixedTemporalLayersStrategy.

TBR=andresp
BUG=2037

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4829 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc | 2 +-
 .../modules/video_coding/main/source/video_sender_unittest.cc | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 6f231f7076..c6985ae3cf 100644
--- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -241,7 +241,7 @@ TEST_F(TestVp8Impl, DISABLED_ON_ANDROID(AlignedStrideEncodeDecode)) {
   EXPECT_GT(I420PSNR(&input_frame_, &decoded_video_frame_), 36);
 }
 
-TEST_F(TestVp8Impl, DecodeWithACompleteKeyFrame) {
+TEST_F(TestVp8Impl, DISABLED_ON_ANDROID(DecodeWithACompleteKeyFrame)) {
   SetUpEncodeDecode();
   encoder_->Encode(input_frame_, NULL, NULL);
   EXPECT_GT(WaitForEncodedFrame(), 0);
diff --git a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
index 3a9946bd3d..9f341b159f 100644
--- a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
@@ -21,6 +21,7 @@
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/gtest_disable.h"
 
 using ::testing::_;
 using ::testing::AllOf;
@@ -324,7 +325,8 @@ class TestVideoSenderWithVp8 : public TestVideoSender {
   int available_bitrate_kbps_;
 };
 
-TEST_F(TestVideoSenderWithVp8, FixedTemporalLayersStrategy) {
+TEST_F(TestVideoSenderWithVp8,
+       DISABLED_ON_ANDROID(FixedTemporalLayersStrategy)) {
   // It appears that this 5 seconds simulation are need to allow
   // bitrate and framerate to stabilize.
   // TODO(andresp): the framerate calculation should be improved.