commit cf18b34cf3bbb1cc2984f8ae3a1c5cebf92b7007
author solenberg <solenberg@webrtc.org> Thu Oct 01 08:13:42 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 01 15:13:46 2015 +0000
tree 2b18d7092b06bcbc9cd9c83e0c235ad4d0398af9
parent 8c471e7bdfc3bd420d19af118b2bdf8fd716288e

Align new VoE API with design.

BUG=webrtc:4690

Review URL: https://codereview.webrtc.org/1376153003

Cr-Commit-Position: refs/heads/master@{#10136}

webrtc/audio_receive_stream.h

diff --git a/webrtc/audio_receive_stream.h b/webrtc/audio_receive_stream.h
index 9a8601d..70d6480 100644
--- a/webrtc/audio_receive_stream.h
+++ b/webrtc/audio_receive_stream.h
@@ -17,6 +17,7 @@
 
 #include "webrtc/config.h"
 #include "webrtc/stream.h"
+#include "webrtc/transport.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -44,9 +45,13 @@
       std::vector<RtpExtension> extensions;
     } rtp;
 
-    // Underlying VoiceEngine handle, used to map AudioReceiveStream to
-    // lower-level components. Temporarily used while VoiceEngine channels are
-    // created outside of Call.
+    Transport* receive_transport = nullptr;
+    Transport* rtcp_send_transport = nullptr;
+
+    // Underlying VoiceEngine handle, used to map AudioReceiveStream to lower-
+    // level components.
+    // TODO(solenberg): Remove when VoiceEngine channels are created outside
+    // of Call.
     int voe_channel_id = -1;
 
     // Identifier for an A/V synchronization group. Empty string to disable.

webrtc/audio_send_stream.h

diff --git a/webrtc/audio_send_stream.h b/webrtc/audio_send_stream.h
index 695d28f..2fb288f 100644
--- a/webrtc/audio_send_stream.h
+++ b/webrtc/audio_send_stream.h
@@ -48,6 +48,12 @@
     // Transport for outgoing packets.
     Transport* send_transport = nullptr;
 
+    // Underlying VoiceEngine handle, used to map AudioSendStream to lower-level
+    // components.
+    // TODO(solenberg): Remove when VoiceEngine channels are created outside
+    // of Call.
+    int voe_channel_id = -1;
+
     rtc::scoped_ptr<AudioEncoder> encoder;
     int cng_payload_type = -1;  // pt, or -1 to disable Comfort Noise Generator.
     int red_payload_type = -1;  // pt, or -1 to disable REDundant coding.

webrtc/call.h

diff --git a/webrtc/call.h b/webrtc/call.h
index e426cc5..033e1a2 100644
--- a/webrtc/call.h
+++ b/webrtc/call.h
@@ -85,7 +85,7 @@
     } bitrate_config;
 
     struct AudioConfig {
-      AudioDeviceModule* audio_device_manager = nullptr;
+      AudioDeviceModule* audio_device_module = nullptr;
       AudioProcessing* audio_processing = nullptr;
       VoiceEngineObserver* voice_engine_observer = nullptr;
     } audio_config;