Index: webrtc/test/call_test.h |
diff --git a/webrtc/test/call_test.h b/webrtc/test/call_test.h |
index 32820edea625d87128d2a8e66f7fda8e85ef68fc..04aa5eb14cfa2af4da47ff40973399cb6cea1da0 100644 |
--- a/webrtc/test/call_test.h |
+++ b/webrtc/test/call_test.h |
@@ -13,13 +13,20 @@ |
#include <vector> |
#include "webrtc/call.h" |
+#include "webrtc/call/transport_adapter.h" |
#include "webrtc/system_wrappers/include/scoped_vector.h" |
+#include "webrtc/test/fake_audio_device.h" |
#include "webrtc/test/fake_decoder.h" |
#include "webrtc/test/fake_encoder.h" |
#include "webrtc/test/frame_generator_capturer.h" |
#include "webrtc/test/rtp_rtcp_observer.h" |
namespace webrtc { |
+ |
+class VoEBase; |
+class VoECodec; |
+class VoENetwork; |
+ |
namespace test { |
class BaseTest; |
@@ -33,15 +40,18 @@ class CallTest : public ::testing::Test { |
static const int kDefaultTimeoutMs; |
static const int kLongTimeoutMs; |
- static const uint8_t kSendPayloadType; |
+ static const uint8_t kVideoSendPayloadType; |
static const uint8_t kSendRtxPayloadType; |
- static const uint8_t kFakeSendPayloadType; |
+ static const uint8_t kFakeVideoSendPayloadType; |
static const uint8_t kRedPayloadType; |
static const uint8_t kRtxRedPayloadType; |
static const uint8_t kUlpfecPayloadType; |
+ static const uint8_t kAudioSendPayloadType; |
static const uint32_t kSendRtxSsrcs[kNumSsrcs]; |
- static const uint32_t kSendSsrcs[kNumSsrcs]; |
- static const uint32_t kReceiverLocalSsrc; |
+ static const uint32_t kVideoSendSsrcs[kNumSsrcs]; |
+ static const uint32_t kAudioSendSsrc; |
+ static const uint32_t kReceiverLocalVideoSsrc; |
+ static const uint32_t kReceiverLocalAudioSsrc; |
static const int kNackRtpHistoryMs; |
protected: |
@@ -53,12 +63,17 @@ class CallTest : public ::testing::Test { |
void CreateReceiverCall(const Call::Config& config); |
void DestroyCalls(); |
- void CreateSendConfig(size_t num_streams, Transport* send_transport); |
- void CreateMatchingReceiveConfigs(Transport* rtcp_send_transport); |
+ void CreateSendConfig(size_t num_video_streams, |
+ size_t num_audio_streams, |
+ Transport* send_transport); |
+ void CreateMatchingReceiveConfigs(bool create_audio_recv_stream, |
+ Transport* rtcp_send_transport); |
void CreateFrameGeneratorCapturer(); |
+ void CreateFakeAudioDevices(); |
- void CreateStreams(); |
+ void CreateVideoStreams(); |
+ void CreateAudioStreams(); |
void Start(); |
void Stop(); |
void DestroyStreams(); |
@@ -70,15 +85,46 @@ class CallTest : public ::testing::Test { |
VideoSendStream::Config video_send_config_; |
VideoEncoderConfig video_encoder_config_; |
VideoSendStream* video_send_stream_; |
+ AudioSendStream::Config audio_send_config_; |
+ AudioSendStream* audio_send_stream_; |
rtc::scoped_ptr<Call> receiver_call_; |
rtc::scoped_ptr<PacketTransport> receive_transport_; |
std::vector<VideoReceiveStream::Config> video_receive_configs_; |
std::vector<VideoReceiveStream*> video_receive_streams_; |
+ std::vector<AudioReceiveStream::Config> audio_receive_configs_; |
+ std::vector<AudioReceiveStream*> audio_receive_streams_; |
rtc::scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_; |
test::FakeEncoder fake_encoder_; |
ScopedVector<VideoDecoder> allocated_decoders_; |
+ |
+ private: |
+ // TODO(holmer): Remove once voice engine is fully refactored to the new API. |
+ // These methods are used to set up legacy voice engines and channels which is |
+ // necessary while voice engine is being refactored to the new stream API. |
+ void CreateVoiceEngines(); |
+ void SetupVoiceEngineTransports(PacketTransport* send_transport, |
+ PacketTransport* recv_transport); |
+ void DestroyVoiceEngines(); |
+ |
+ int voe_send_channel_id_; |
+ int voe_recv_channel_id_; |
+ |
+ VoiceEngine* send_voice_engine_; |
+ VoiceEngine* recv_voice_engine_; |
+ VoEBase* voe_send_base_; |
+ VoENetwork* voe_send_network_; |
+ VoECodec* voe_send_codec_; |
+ VoEBase* voe_recv_base_; |
+ VoENetwork* voe_recv_network_; |
+ VoECodec* voe_recv_codec_; |
+ rtc::scoped_ptr<internal::TransportAdapter> voe_send_transport_adapter_; |
+ rtc::scoped_ptr<internal::TransportAdapter> voe_recv_transport_adapter_; |
+ |
+ // The audio devices must outlive the voice engines. |
+ rtc::scoped_ptr<test::FakeAudioDevice> fake_send_audio_device_; |
+ rtc::scoped_ptr<test::FakeAudioDevice> fake_recv_audio_device_; |
}; |
class BaseTest : public RtpRtcpObserver { |
@@ -89,7 +135,8 @@ class BaseTest : public RtpRtcpObserver { |
virtual void PerformTest() = 0; |
virtual bool ShouldCreateReceivers() const = 0; |
- virtual size_t GetNumStreams() const; |
+ virtual size_t GetNumVideoStreams() const; |
+ virtual size_t GetNumAudioStreams() const; |
virtual Call::Config GetSenderCallConfig(); |
virtual Call::Config GetReceiverCallConfig(); |
@@ -105,6 +152,13 @@ class BaseTest : public RtpRtcpObserver { |
VideoSendStream* send_stream, |
const std::vector<VideoReceiveStream*>& receive_streams); |
+ virtual void ModifyAudioConfigs( |
+ AudioSendStream::Config* send_config, |
+ std::vector<AudioReceiveStream::Config>* receive_configsg); |
+ virtual void OnAudioStreamsCreated( |
+ AudioSendStream* send_stream, |
+ const std::vector<AudioReceiveStream*>& receive_streams); |
+ |
virtual void OnFrameGeneratorCapturerCreated( |
FrameGeneratorCapturer* frame_generator_capturer); |
}; |