From 835dbf45162a3b25af1ddfec32eb072d35672147 Mon Sep 17 00:00:00 2001
From: "pwestin@webrtc.org"
 <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 4 Apr 2013 17:24:15 +0000
Subject: [PATCH] Fix no received audio in tests.

BUG=1582, 1581
Review URL: https://webrtc-codereview.appspot.com/1281005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3763 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/test/channel_transport/channel_transport.cc | 7 ++++++-
 webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc  | 9 ++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/webrtc/test/channel_transport/channel_transport.cc b/webrtc/test/channel_transport/channel_transport.cc
index 3985688bee..0faeb33b15 100644
--- a/webrtc/test/channel_transport/channel_transport.cc
+++ b/webrtc/test/channel_transport/channel_transport.cc
@@ -60,7 +60,12 @@ void VoiceChannelTransport::IncomingRTCPPacket(
 }
 
 int VoiceChannelTransport::SetLocalReceiver(WebRtc_UWord16 rtp_port) {
-  return socket_transport_->InitializeReceiveSockets(this, rtp_port);
+  int return_value = socket_transport_->InitializeReceiveSockets(this,
+                                                                 rtp_port);
+  if (return_value == 0) {
+    return socket_transport_->StartReceiving(kViENumReceiveSocketBuffers);
+  }
+  return return_value;
 }
 
 int VoiceChannelTransport::SetSendDestination(const char* ip_address,
diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
index 96ebec9da1..684ce7b591 100644
--- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -325,14 +325,13 @@ void RunTest(std::string out_path) {
 #endif
   int channel_index = 0;
   std::vector<int> channels(kMaxNumChannels);
-  std::vector<scoped_ptr<VoiceChannelTransport> > voice_channel_transports;
+  std::vector<VoiceChannelTransport*> voice_channel_transports(kMaxNumChannels);
 
   for (i = 0; i < kMaxNumChannels; ++i) {
     channels[i] = base1->CreateChannel();
     int port = rPort + (i + 1) * 2;
 
-    voice_channel_transports[i].reset(
-        new VoiceChannelTransport(netw, channels[i]));
+    voice_channel_transports[i] = new VoiceChannelTransport(netw, channels[i]);
 
     printf("Set Send IP \n");
     res = voice_channel_transports[i]->SetSendDestination(ip, port);
@@ -879,6 +878,10 @@ void RunTest(std::string out_path) {
     newcall = (1 == i);
     // Call loop
   }
+  for (i = 0; i < kMaxNumChannels; ++i) {
+    delete voice_channel_transports[i];
+    voice_channel_transports[i] = NULL;
+  }
 
   printf("Delete channels \n");
   res = base1->DeleteChannel(chan);