Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

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

Issue 2784543002: Revert of Don't hardcode MediaType::ANY in FakeNetworkPipe. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/test/layer_filtering_transport.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_RTP_RTCP_OBSERVER_H_ 10 #ifndef WEBRTC_TEST_RTP_RTCP_OBSERVER_H_
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 const int timeout_ms_; 87 const int timeout_ms_;
88 }; 88 };
89 89
90 class PacketTransport : public test::DirectTransport { 90 class PacketTransport : public test::DirectTransport {
91 public: 91 public:
92 enum TransportType { kReceiver, kSender }; 92 enum TransportType { kReceiver, kSender };
93 93
94 PacketTransport(Call* send_call, 94 PacketTransport(Call* send_call,
95 RtpRtcpObserver* observer, 95 RtpRtcpObserver* observer,
96 TransportType transport_type, 96 TransportType transport_type,
97 MediaType media_type,
98 const FakeNetworkPipe::Config& configuration) 97 const FakeNetworkPipe::Config& configuration)
99 : test::DirectTransport(configuration, send_call, media_type), 98 : test::DirectTransport(configuration, send_call),
100 observer_(observer), 99 observer_(observer),
101 transport_type_(transport_type) {} 100 transport_type_(transport_type) {}
102 101
103 private: 102 private:
104 bool SendRtp(const uint8_t* packet, 103 bool SendRtp(const uint8_t* packet,
105 size_t length, 104 size_t length,
106 const PacketOptions& options) override { 105 const PacketOptions& options) override {
107 EXPECT_FALSE(RtpHeaderParser::IsRtcp(packet, length)); 106 EXPECT_FALSE(RtpHeaderParser::IsRtcp(packet, length));
108 RtpRtcpObserver::Action action; 107 RtpRtcpObserver::Action action;
109 { 108 {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 return true; // Will never happen, makes compiler happy. 142 return true; // Will never happen, makes compiler happy.
144 } 143 }
145 144
146 RtpRtcpObserver* const observer_; 145 RtpRtcpObserver* const observer_;
147 TransportType transport_type_; 146 TransportType transport_type_;
148 }; 147 };
149 } // namespace test 148 } // namespace test
150 } // namespace webrtc 149 } // namespace webrtc
151 150
152 #endif // WEBRTC_TEST_RTP_RTCP_OBSERVER_H_ 151 #endif // WEBRTC_TEST_RTP_RTCP_OBSERVER_H_
OLDNEW
« no previous file with comments | « webrtc/test/layer_filtering_transport.cc ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698