| Index: webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| index 10bf411a3d90d0b0d8b5e9414bde1e1818cf6282..e7afccbf5700dde9844e3097ac352accbf6ffcff 100644
|
| --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
|
| @@ -98,24 +98,20 @@ class ConferenceTransport: public webrtc::Transport {
|
| bool GetReceiverStatistics(unsigned int id, webrtc::CallStatistics* stats);
|
|
|
| // Inherit from class webrtc::Transport.
|
| - int SendPacket(int channel, const void *data, size_t len) override;
|
| - int SendRTCPPacket(int channel, const void *data, size_t len) override;
|
| + int SendPacket(const void *data, size_t len) override;
|
| + int SendRTCPPacket(const void *data, size_t len) override;
|
|
|
| private:
|
| struct Packet {
|
| enum Type { Rtp, Rtcp, } type_;
|
|
|
| Packet() : len_(0) {}
|
| - Packet(Type type, int channel, const void* data, size_t len, uint32 time_ms)
|
| - : type_(type),
|
| - channel_(channel),
|
| - len_(len),
|
| - send_time_ms_(time_ms) {
|
| + Packet(Type type, const void* data, size_t len, uint32 time_ms)
|
| + : type_(type), len_(len), send_time_ms_(time_ms) {
|
| EXPECT_LE(len_, kMaxPacketSizeByte);
|
| memcpy(data_, data, len_);
|
| }
|
|
|
| - int channel_;
|
| uint8_t data_[kMaxPacketSizeByte];
|
| size_t len_;
|
| uint32 send_time_ms_;
|
| @@ -126,8 +122,7 @@ class ConferenceTransport: public webrtc::Transport {
|
| }
|
|
|
| int GetReceiverChannelForSsrc(unsigned int sender_ssrc) const;
|
| - void StorePacket(Packet::Type type, int channel, const void* data,
|
| - size_t len);
|
| + void StorePacket(Packet::Type type, const void* data, size_t len);
|
| void SendPacket(const Packet& packet);
|
| bool DispatchPackets();
|
|
|
|
|