zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align new VoE API with design.

Browse Source 
BUG=webrtc:4690

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

Cr-Commit-Position: refs/heads/master@{#10136}
This commit is contained in:
solenberg
2015-10-01 08:13:42 -07:00
committed by Commit bot
parent 8c471e7bdf
commit cf18b34cf3
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/audio_receive_stream.h
View File

@ -17,6 +17,7 @@
#include "webrtc/config.h" #include "webrtc/config.h"
#include "webrtc/stream.h" #include "webrtc/stream.h"
#include "webrtc/transport.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
@ -44,9 +45,13 @@ class AudioReceiveStream : public ReceiveStream {
std::vector<RtpExtension> extensions; std::vector<RtpExtension> extensions;
} rtp; } rtp;
// Underlying VoiceEngine handle, used to map AudioReceiveStream to Transport* receive_transport = nullptr;
// lower-level components. Temporarily used while VoiceEngine channels are Transport* rtcp_send_transport = nullptr;
// created outside of Call.
// 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; int voe_channel_id = -1;
// Identifier for an A/V synchronization group. Empty string to disable. // Identifier for an A/V synchronization group. Empty string to disable.

6
webrtc/audio_send_stream.h
View File

@ -48,6 +48,12 @@ class AudioSendStream : public SendStream {
// Transport for outgoing packets. // Transport for outgoing packets.
Transport* send_transport = nullptr; 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; rtc::scoped_ptr<AudioEncoder> encoder;
int cng_payload_type = -1; // pt, or -1 to disable Comfort Noise Generator. 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. int red_payload_type = -1; // pt, or -1 to disable REDundant coding.

2
webrtc/call.h
View File

@ -85,7 +85,7 @@ class Call {
} bitrate_config; } bitrate_config;
struct AudioConfig { struct AudioConfig {
AudioDeviceModule* audio_device_manager = nullptr; AudioDeviceModule* audio_device_module = nullptr;
AudioProcessing* audio_processing = nullptr; AudioProcessing* audio_processing = nullptr;
VoiceEngineObserver* voice_engine_observer = nullptr; VoiceEngineObserver* voice_engine_observer = nullptr;
} audio_config; } audio_config;