Disable REMB test when using vivi.

BUG=321
TEST=vie_auto_test

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1844 4adac7df-926f-26a2-2b94-8c16560cd09d

src/video_engine/test/auto_test/interface/tb_capture_device.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -11,6 +11,8 @@
 #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_CAPTURE_DEVICE_H_
 #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_CAPTURE_DEVICE_H_
 
+#include <string>
+
 #include "tb_interfaces.h"
 #include "video_capture_factory.h"
 
@@ -23,9 +25,12 @@ public:
     int captureId;
     void ConnectTo(int videoChannel);
     void Disconnect(int videoChannel);
+    std::string device_name() const;
+
 private:
     TbInterfaces& ViE;
     webrtc::VideoCaptureModule* vcpm_;
+    std::string device_name_;
 };
 
 #endif  // WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_CAPTURE_DEVICE_H_

src/video_engine/test/auto_test/source/tb_capture_device.cc

@@ -57,6 +57,7 @@ TbCaptureDevice::TbCaptureDevice(TbInterfaces& Engine) :
         return;
     }
 
+    device_name_ = deviceName;
     ViETest::Log("Starting capture device %s with captureId %d\n", deviceName,
                  captureId);
     EXPECT_EQ(0, ViE.capture->StartCapture(captureId));
@@ -79,3 +80,7 @@ void TbCaptureDevice::Disconnect(int videoChannel)
 {
     EXPECT_EQ(0, ViE.capture->DisconnectCaptureDevice(videoChannel));
 }
+
+std::string TbCaptureDevice::device_name() const {
+  return device_name_;
+}

src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc

@@ -375,9 +375,11 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
     // Deregister external transport
     EXPECT_EQ(0, ViE.network->DeregisterSendTransport(tbChannel.videoChannel));
 
-    // Temporarily disabling flaky test.
+    // The linux virtual cam, vivi, gives a too simple image to encode,
-#if 0
+    // resulting in a low bitrate, and the REMB test below fails. Disabling the
-    {
+    // test if vivi is used while waiting for a better virtual device.
+    // BUG = 321.
+    if (tbCapture.device_name() != "vivi") {
       // Create three channels. 1 and 2 are grouped together and will get a
       // common REMB packet. 3 is in its own group and will get a separate REMB
       // packet. To verify we receive a REMB, set a higher start bitrate for 2
@@ -464,7 +466,6 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
       EXPECT_EQ(0, ViE.base->DeleteChannel(channel_2));
       EXPECT_EQ(0, ViE.base->DeleteChannel(channel_3));
     }
-#endif
 
     //***************************************************************
     //  Testing finished. Tear down Video Engine