Chromium Code Reviews| 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 9f5546eecd514ad4b8f468d0789b3e4b3244624b..27229d4020f7a19493bf096ac3b6a38e4de8defc 100644 |
| --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h |
| +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h |
| @@ -27,7 +27,7 @@ |
| #include "webrtc/voice_engine/include/voe_file.h" |
| #include "webrtc/voice_engine/include/voe_network.h" |
| #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" |
| - |
| +#include "webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h" |
|
tlegrand-webrtc
2015/08/05 13:32:44
CL description talks about Loudness filter, but in
minyue-webrtc
2015/08/06 13:31:22
The CL title was made wrong, and I have changed it
|
| static const size_t kMaxPacketSizeByte = 1500; |
| @@ -57,9 +57,13 @@ class ConferenceTransport: public webrtc::Transport { |
| /* AddStream() |
| * Adds a stream in the conference. |
| * |
| + * Input: |
| + * file_name : name of the file to be added as microphone input, |
|
tlegrand-webrtc
2015/08/05 13:32:44
Nit , -> .
minyue-webrtc
2015/08/06 13:31:22
Ok. I thought "," was more correct, since it is an
tlegrand-webrtc
2015/08/06 14:51:55
Aha. Not sure about the style guide, but I read it
|
| + * format : format of the input file. |
| + * |
| * Returns stream id. |
| */ |
| - unsigned int AddStream(); |
| + unsigned int AddStream(std::string file_name, webrtc::FileFormats format); |
| /* RemoveStream() |
| * Removes a stream with specified ID from the conference. |
| @@ -123,7 +127,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 SendPacket(const Packet& packet) const; |
| + void SendPacket(const Packet& packet); |
| bool DispatchPackets(); |
| const rtc::scoped_ptr<webrtc::CriticalSectionWrapper> pq_crit_; |
| @@ -152,6 +156,8 @@ class ConferenceTransport: public webrtc::Transport { |
| webrtc::VoERTP_RTCP* remote_rtp_rtcp_; |
| webrtc::VoENetwork* remote_network_; |
| webrtc::VoEFile* remote_file_; |
| + |
| + LoudestFilter loudest_filter_; |
|
tlegrand-webrtc
2015/08/05 13:32:44
Should this be "LoudnessFilter loudness_filter" in
minyue-webrtc
2015/08/06 13:31:22
Henrik and I like Loudest better, so I changed the
tlegrand-webrtc
2015/08/06 14:51:55
Acknowledged.
|
| }; |
| } // namespace voetest |