diff options
| author | Peter Boström <pbos@webrtc.org> | 2015-09-17 23:03:57 +0200 |
|---|---|---|
| committer | Peter Boström <pbos@webrtc.org> | 2015-09-17 21:06:02 +0000 |
| commit | ac547a653862744d0aae560713f8418ad2852085 (patch) | |
| tree | d0e4288633c8c264e9a528e7d1948fd2b5b8690d /webrtc/test/mock_transport.h | |
| parent | 1d5198d5d2c70921a459255afbe0ff83de4a60fd (diff) | |
| download | webrtc-ac547a653862744d0aae560713f8418ad2852085.tar.gz | |
Remove channel ids from various interfaces.
Starts by removing channel/engine id from ViEChannel which propagates
down to the RTP/RTCP module as well as the transport class.
IncomingVideoStream::RenderFrame() is untouched for now but receives a
fake id instead of the previous channel id. Added a TODO to remove it
later but the RenderFrame call is implemented in a lot of
platform-dependent files and should probably remove the "manager" aspect
of renderers, so preferring to do it separately
BUG=webrtc:1695
R=henrika@webrtc.org, mflodman@webrtc.org
Review URL: https://codereview.webrtc.org/1335353005 .
Cr-Commit-Position: refs/heads/master@{#9978}
Diffstat (limited to 'webrtc/test/mock_transport.h')
| -rw-r--r-- | webrtc/test/mock_transport.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webrtc/test/mock_transport.h b/webrtc/test/mock_transport.h index 5b1cb8dfb6..823baf4c43 100644 --- a/webrtc/test/mock_transport.h +++ b/webrtc/test/mock_transport.h @@ -18,10 +18,8 @@ namespace webrtc { class MockTransport : public webrtc::Transport { public: - MOCK_METHOD3(SendPacket, - int(int channel, const void* data, size_t len)); - MOCK_METHOD3(SendRTCPPacket, - int(int channel, const void* data, size_t len)); + MOCK_METHOD2(SendPacket, int(const void* data, size_t len)); + MOCK_METHOD2(SendRTCPPacket, int(const void* data, size_t len)); }; } // namespace webrtc #endif // WEBRTC_TEST_MOCK_TRANSPORT_H_ |