From 713f91e12b47de7be3d3a25995a08613fc5dd74c Mon Sep 17 00:00:00 2001
From: "amyfong@webrtc.org"
 <amyfong@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 23 Sep 2011 16:41:26 +0000
Subject: [PATCH] Fixed vie_autotest_custom_call.cc minor issues.

1. mirror of local render removed
2. the video device the user selected wasn't what was actually being used when the call is being made
3. fixed mentions of loopback calls
Review URL: http://webrtc-codereview.appspot.com/171001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@643 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../source/vie_autotest_custom_call.cc        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_custom_call.cc b/src/video_engine/main/test/AutoTest/source/vie_autotest_custom_call.cc
index f8812f528c..584a87856d 100644
--- a/src/video_engine/main/test/AutoTest/source/vie_autotest_custom_call.cc
+++ b/src/video_engine/main/test/AutoTest/source/vie_autotest_custom_call.cc
@@ -450,11 +450,6 @@ int ViEAutoTest::ViECustomCall()
                                              "ERROR: %s at line %d",
                                              __FUNCTION__, __LINE__);
 
-        error = ptrViERender->MirrorRenderStream(captureId, true, false, true);
-        numberOfErrors += ViETest::TestError(error == 0,
-                                             "ERROR: %s at line %d",
-                                             __FUNCTION__, __LINE__);
-
         error = ptrViERender->StartRender(captureId);
         numberOfErrors += ViETest::TestError(error == 0,
                                              "ERROR: %s at line %d",
@@ -472,7 +467,7 @@ int ViEAutoTest::ViECustomCall()
 
         // Call started
         std::cout << std::endl;
-        std::cout << "Loopback call started" << std::endl;
+        std::cout << "Custom call started" << std::endl;
         std::cout << std::endl << std::endl;
         std::cout << "Press enter to stop...";
         std::getline(std::cin, str);
@@ -588,7 +583,7 @@ int ViEAutoTest::ViECustomCall()
                                              __FUNCTION__, __LINE__);
 
         ViETest::Log(" ");
-        ViETest::Log(" ViE Autotest Loopback Call Done");
+        ViETest::Log(" ViE Autotest Custom Call Started");
         ViETest::Log("========================================");
         ViETest::Log(" ");
     }
@@ -634,6 +629,15 @@ bool ViEAutoTest::GetVideoDevice(webrtc::ViEBase* ptrViEBase,
             std::cout << "   " << captureIdx+1 << ". " << deviceName
                       << std::endl;
         }
+        //  Get the devName of the default (or first) camera for display
+        error = ptrViECapture->GetCaptureDevice(0, deviceName,
+                                                KMaxDeviceNameLength,
+                                                uniqueId,
+                                                KMaxUniqueIdLength);
+        numberOfErrors += ViETest::TestError(error == 0,
+                                             "ERROR: %s at line %d",
+                                              __FUNCTION__, __LINE__);
+
         std::cout << "Choose a capture device. Press enter for default ("
                   << deviceName << "/" << uniqueId << "): ";
         std::getline(std::cin, str);
@@ -670,7 +674,7 @@ bool ViEAutoTest::GetVideoDevice(webrtc::ViEBase* ptrViEBase,
             numberOfErrors += ViETest::TestError(error == 0,
                                                  "ERROR: %s at line %d",
                                                  __FUNCTION__, __LINE__);
-            strcpy(captureDeviceName, uniqueId);
+            strcpy(captureDeviceUniqueId, uniqueId);
             strcpy(captureDeviceName, deviceName);
             return true;
         }