Chromium Code Reviews

Side by Side Diff: webrtc/test/direct_transport.h

Issue 2794243002: Making FakeNetworkPipe demux audio and video packets. (Closed)
Patch Set: new solution Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #ifndef WEBRTC_TEST_DIRECT_TRANSPORT_H_ 10 #ifndef WEBRTC_TEST_DIRECT_TRANSPORT_H_
(...skipping 12 matching lines...)
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 class Clock; 26 class Clock;
27 class PacketReceiver; 27 class PacketReceiver;
28 28
29 namespace test { 29 namespace test {
30 30
31 class DirectTransport : public Transport { 31 class DirectTransport : public Transport {
32 public: 32 public:
33 DirectTransport(Call* send_call, MediaType media_type); 33 DirectTransport(Call* send_call,
34 DirectTransport(const FakeNetworkPipe::Config& config, Call* send_call, 34 const std::map<uint8_t, MediaType>& payload_type_map);
35 MediaType media_type); 35 DirectTransport(const FakeNetworkPipe::Config& config,
36 Call* send_call,
37 const std::map<uint8_t, MediaType>& payload_type_map);
36 // These deprecated variants always use MediaType::VIDEO. 38 // These deprecated variants always use MediaType::VIDEO.
37 RTC_DEPRECATED explicit DirectTransport(Call* send_call) 39 RTC_DEPRECATED explicit DirectTransport(Call* send_call)
38 : DirectTransport(send_call, MediaType::VIDEO) {} 40 : DirectTransport(send_call, {{}}) {}
39 41
40 RTC_DEPRECATED DirectTransport(const FakeNetworkPipe::Config& config, 42 RTC_DEPRECATED DirectTransport(const FakeNetworkPipe::Config& config,
41 Call* send_call) 43 Call* send_call)
42 : DirectTransport(config, send_call, MediaType::VIDEO) {} 44 : DirectTransport(config, send_call, {{}}) {}
43 45
44 ~DirectTransport(); 46 ~DirectTransport();
45 47
46 void SetConfig(const FakeNetworkPipe::Config& config); 48 void SetConfig(const FakeNetworkPipe::Config& config);
47 49
48 virtual void StopSending(); 50 virtual void StopSending();
49 // TODO(holmer): Look into moving this to the constructor. 51 // TODO(holmer): Look into moving this to the constructor.
50 virtual void SetReceiver(PacketReceiver* receiver); 52 virtual void SetReceiver(PacketReceiver* receiver);
51 53
52 bool SendRtp(const uint8_t* data, 54 bool SendRtp(const uint8_t* data,
(...skipping 14 matching lines...)
67 Clock* const clock_; 69 Clock* const clock_;
68 70
69 bool shutting_down_; 71 bool shutting_down_;
70 72
71 FakeNetworkPipe fake_network_; 73 FakeNetworkPipe fake_network_;
72 }; 74 };
73 } // namespace test 75 } // namespace test
74 } // namespace webrtc 76 } // namespace webrtc
75 77
76 #endif // WEBRTC_TEST_DIRECT_TRANSPORT_H_ 78 #endif // WEBRTC_TEST_DIRECT_TRANSPORT_H_
OLDNEW

Powered by Google App Engine