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

Side by Side Diff: webrtc/media/base/fakemediaengine.h

Issue 2675173003: Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc. (Closed)
Patch Set: Add memcheck suppression for end-to-end tests. Created 3 years, 9 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/media/base/codec.h ('k') | webrtc/ortc/BUILD.gn » ('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) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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 10
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 return send_streams_[0].first_ssrc(); 199 return send_streams_[0].first_ssrc();
200 } 200 }
201 201
202 // TODO(perkj): This is to support legacy unit test that only check one 202 // TODO(perkj): This is to support legacy unit test that only check one
203 // sending stream. 203 // sending stream.
204 const std::string rtcp_cname() { 204 const std::string rtcp_cname() {
205 if (send_streams_.empty()) 205 if (send_streams_.empty())
206 return ""; 206 return "";
207 return send_streams_[0].cname; 207 return send_streams_[0].cname;
208 } 208 }
209 const RtcpParameters& send_rtcp_parameters() { return send_rtcp_parameters_; }
210 const RtcpParameters& recv_rtcp_parameters() { return recv_rtcp_parameters_; }
209 211
210 bool ready_to_send() const { 212 bool ready_to_send() const {
211 return ready_to_send_; 213 return ready_to_send_;
212 } 214 }
213 215
214 int transport_overhead_per_packet() const { 216 int transport_overhead_per_packet() const {
215 return transport_overhead_per_packet_; 217 return transport_overhead_per_packet_;
216 } 218 }
217 219
218 rtc::NetworkRoute last_network_route() const { return last_network_route_; } 220 rtc::NetworkRoute last_network_route() const { return last_network_route_; }
(...skipping 20 matching lines...) Expand all
239 } 241 }
240 void set_playout(bool playout) { playout_ = playout; } 242 void set_playout(bool playout) { playout_ = playout; }
241 bool SetRecvRtpHeaderExtensions(const std::vector<RtpExtension>& extensions) { 243 bool SetRecvRtpHeaderExtensions(const std::vector<RtpExtension>& extensions) {
242 recv_extensions_ = extensions; 244 recv_extensions_ = extensions;
243 return true; 245 return true;
244 } 246 }
245 bool SetSendRtpHeaderExtensions(const std::vector<RtpExtension>& extensions) { 247 bool SetSendRtpHeaderExtensions(const std::vector<RtpExtension>& extensions) {
246 send_extensions_ = extensions; 248 send_extensions_ = extensions;
247 return true; 249 return true;
248 } 250 }
251 void set_send_rtcp_parameters(const RtcpParameters& params) {
252 send_rtcp_parameters_ = params;
253 }
254 void set_recv_rtcp_parameters(const RtcpParameters& params) {
255 recv_rtcp_parameters_ = params;
256 }
249 virtual void OnPacketReceived(rtc::CopyOnWriteBuffer* packet, 257 virtual void OnPacketReceived(rtc::CopyOnWriteBuffer* packet,
250 const rtc::PacketTime& packet_time) { 258 const rtc::PacketTime& packet_time) {
251 rtp_packets_.push_back(std::string(packet->data<char>(), packet->size())); 259 rtp_packets_.push_back(std::string(packet->data<char>(), packet->size()));
252 } 260 }
253 virtual void OnRtcpReceived(rtc::CopyOnWriteBuffer* packet, 261 virtual void OnRtcpReceived(rtc::CopyOnWriteBuffer* packet,
254 const rtc::PacketTime& packet_time) { 262 const rtc::PacketTime& packet_time) {
255 rtcp_packets_.push_back(std::string(packet->data<char>(), packet->size())); 263 rtcp_packets_.push_back(std::string(packet->data<char>(), packet->size()));
256 } 264 }
257 virtual void OnReadyToSend(bool ready) { 265 virtual void OnReadyToSend(bool ready) {
258 ready_to_send_ = ready; 266 ready_to_send_ = ready;
(...skipping 12 matching lines...) Expand all
271 279
272 private: 280 private:
273 bool sending_; 281 bool sending_;
274 bool playout_; 282 bool playout_;
275 std::vector<RtpExtension> recv_extensions_; 283 std::vector<RtpExtension> recv_extensions_;
276 std::vector<RtpExtension> send_extensions_; 284 std::vector<RtpExtension> send_extensions_;
277 std::list<std::string> rtp_packets_; 285 std::list<std::string> rtp_packets_;
278 std::list<std::string> rtcp_packets_; 286 std::list<std::string> rtcp_packets_;
279 std::vector<StreamParams> send_streams_; 287 std::vector<StreamParams> send_streams_;
280 std::vector<StreamParams> receive_streams_; 288 std::vector<StreamParams> receive_streams_;
289 RtcpParameters send_rtcp_parameters_;
290 RtcpParameters recv_rtcp_parameters_;
281 std::set<uint32_t> muted_streams_; 291 std::set<uint32_t> muted_streams_;
282 std::map<uint32_t, webrtc::RtpParameters> rtp_send_parameters_; 292 std::map<uint32_t, webrtc::RtpParameters> rtp_send_parameters_;
283 std::map<uint32_t, webrtc::RtpParameters> rtp_receive_parameters_; 293 std::map<uint32_t, webrtc::RtpParameters> rtp_receive_parameters_;
284 bool fail_set_send_codecs_; 294 bool fail_set_send_codecs_;
285 bool fail_set_recv_codecs_; 295 bool fail_set_recv_codecs_;
286 uint32_t send_ssrc_; 296 uint32_t send_ssrc_;
287 std::string rtcp_cname_; 297 std::string rtcp_cname_;
288 bool ready_to_send_; 298 bool ready_to_send_;
289 int transport_overhead_per_packet_; 299 int transport_overhead_per_packet_;
290 rtc::NetworkRoute last_network_route_; 300 rtc::NetworkRoute last_network_route_;
(...skipping 20 matching lines...) Expand all
311 ~FakeVoiceMediaChannel(); 321 ~FakeVoiceMediaChannel();
312 const std::vector<AudioCodec>& recv_codecs() const { return recv_codecs_; } 322 const std::vector<AudioCodec>& recv_codecs() const { return recv_codecs_; }
313 const std::vector<AudioCodec>& send_codecs() const { return send_codecs_; } 323 const std::vector<AudioCodec>& send_codecs() const { return send_codecs_; }
314 const std::vector<AudioCodec>& codecs() const { return send_codecs(); } 324 const std::vector<AudioCodec>& codecs() const { return send_codecs(); }
315 const std::vector<DtmfInfo>& dtmf_info_queue() const { 325 const std::vector<DtmfInfo>& dtmf_info_queue() const {
316 return dtmf_info_queue_; 326 return dtmf_info_queue_;
317 } 327 }
318 const AudioOptions& options() const { return options_; } 328 const AudioOptions& options() const { return options_; }
319 int max_bps() const { return max_bps_; } 329 int max_bps() const { return max_bps_; }
320 virtual bool SetSendParameters(const AudioSendParameters& params) { 330 virtual bool SetSendParameters(const AudioSendParameters& params) {
331 set_send_rtcp_parameters(params.rtcp);
321 return (SetSendCodecs(params.codecs) && 332 return (SetSendCodecs(params.codecs) &&
322 SetSendRtpHeaderExtensions(params.extensions) && 333 SetSendRtpHeaderExtensions(params.extensions) &&
323 SetMaxSendBandwidth(params.max_bandwidth_bps) && 334 SetMaxSendBandwidth(params.max_bandwidth_bps) &&
324 SetOptions(params.options)); 335 SetOptions(params.options));
325 } 336 }
326 337
327 virtual bool SetRecvParameters(const AudioRecvParameters& params) { 338 virtual bool SetRecvParameters(const AudioRecvParameters& params) {
339 set_recv_rtcp_parameters(params.rtcp);
328 return (SetRecvCodecs(params.codecs) && 340 return (SetRecvCodecs(params.codecs) &&
329 SetRecvRtpHeaderExtensions(params.extensions)); 341 SetRecvRtpHeaderExtensions(params.extensions));
330 } 342 }
331 343
332 virtual void SetPlayout(bool playout) { set_playout(playout); } 344 virtual void SetPlayout(bool playout) { set_playout(playout); }
333 virtual void SetSend(bool send) { set_sending(send); } 345 virtual void SetSend(bool send) { set_sending(send); }
334 virtual bool SetAudioSend(uint32_t ssrc, 346 virtual bool SetAudioSend(uint32_t ssrc,
335 bool enable, 347 bool enable,
336 const AudioOptions* options, 348 const AudioOptions* options,
337 AudioSource* source) { 349 AudioSource* source) {
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 const std::vector<VideoCodec>& send_codecs() const { return send_codecs_; } 524 const std::vector<VideoCodec>& send_codecs() const { return send_codecs_; }
513 const std::vector<VideoCodec>& codecs() const { return send_codecs(); } 525 const std::vector<VideoCodec>& codecs() const { return send_codecs(); }
514 bool rendering() const { return playout(); } 526 bool rendering() const { return playout(); }
515 const VideoOptions& options() const { return options_; } 527 const VideoOptions& options() const { return options_; }
516 const std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*>& 528 const std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*>&
517 sinks() const { 529 sinks() const {
518 return sinks_; 530 return sinks_;
519 } 531 }
520 int max_bps() const { return max_bps_; } 532 int max_bps() const { return max_bps_; }
521 bool SetSendParameters(const VideoSendParameters& params) override { 533 bool SetSendParameters(const VideoSendParameters& params) override {
534 set_send_rtcp_parameters(params.rtcp);
522 return (SetSendCodecs(params.codecs) && 535 return (SetSendCodecs(params.codecs) &&
523 SetSendRtpHeaderExtensions(params.extensions) && 536 SetSendRtpHeaderExtensions(params.extensions) &&
524 SetMaxSendBandwidth(params.max_bandwidth_bps)); 537 SetMaxSendBandwidth(params.max_bandwidth_bps));
525 } 538 }
526 bool SetRecvParameters(const VideoRecvParameters& params) override { 539 bool SetRecvParameters(const VideoRecvParameters& params) override {
540 set_recv_rtcp_parameters(params.rtcp);
527 return (SetRecvCodecs(params.codecs) && 541 return (SetRecvCodecs(params.codecs) &&
528 SetRecvRtpHeaderExtensions(params.extensions)); 542 SetRecvRtpHeaderExtensions(params.extensions));
529 } 543 }
530 bool AddSendStream(const StreamParams& sp) override { 544 bool AddSendStream(const StreamParams& sp) override {
531 return RtpHelper<VideoMediaChannel>::AddSendStream(sp); 545 return RtpHelper<VideoMediaChannel>::AddSendStream(sp);
532 } 546 }
533 bool RemoveSendStream(uint32_t ssrc) override { 547 bool RemoveSendStream(uint32_t ssrc) override {
534 return RtpHelper<VideoMediaChannel>::RemoveSendStream(ssrc); 548 return RtpHelper<VideoMediaChannel>::RemoveSendStream(ssrc);
535 } 549 }
536 550
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 public: 650 public:
637 explicit FakeDataMediaChannel(void* unused, const DataOptions& options) 651 explicit FakeDataMediaChannel(void* unused, const DataOptions& options)
638 : send_blocked_(false), max_bps_(-1) {} 652 : send_blocked_(false), max_bps_(-1) {}
639 ~FakeDataMediaChannel() {} 653 ~FakeDataMediaChannel() {}
640 const std::vector<DataCodec>& recv_codecs() const { return recv_codecs_; } 654 const std::vector<DataCodec>& recv_codecs() const { return recv_codecs_; }
641 const std::vector<DataCodec>& send_codecs() const { return send_codecs_; } 655 const std::vector<DataCodec>& send_codecs() const { return send_codecs_; }
642 const std::vector<DataCodec>& codecs() const { return send_codecs(); } 656 const std::vector<DataCodec>& codecs() const { return send_codecs(); }
643 int max_bps() const { return max_bps_; } 657 int max_bps() const { return max_bps_; }
644 658
645 virtual bool SetSendParameters(const DataSendParameters& params) { 659 virtual bool SetSendParameters(const DataSendParameters& params) {
660 set_send_rtcp_parameters(params.rtcp);
646 return (SetSendCodecs(params.codecs) && 661 return (SetSendCodecs(params.codecs) &&
647 SetMaxSendBandwidth(params.max_bandwidth_bps)); 662 SetMaxSendBandwidth(params.max_bandwidth_bps));
648 } 663 }
649 virtual bool SetRecvParameters(const DataRecvParameters& params) { 664 virtual bool SetRecvParameters(const DataRecvParameters& params) {
665 set_recv_rtcp_parameters(params.rtcp);
650 return SetRecvCodecs(params.codecs); 666 return SetRecvCodecs(params.codecs);
651 } 667 }
652 virtual bool SetSend(bool send) { return set_sending(send); } 668 virtual bool SetSend(bool send) { return set_sending(send); }
653 virtual bool SetReceive(bool receive) { 669 virtual bool SetReceive(bool receive) {
654 set_playout(receive); 670 set_playout(receive);
655 return true; 671 return true;
656 } 672 }
657 virtual bool AddRecvStream(const StreamParams& sp) { 673 virtual bool AddRecvStream(const StreamParams& sp) {
658 if (!RtpHelper<DataMediaChannel>::AddRecvStream(sp)) 674 if (!RtpHelper<DataMediaChannel>::AddRecvStream(sp))
659 return false; 675 return false;
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 virtual const std::vector<DataCodec>& data_codecs() { return data_codecs_; } 962 virtual const std::vector<DataCodec>& data_codecs() { return data_codecs_; }
947 963
948 private: 964 private:
949 std::vector<FakeDataMediaChannel*> channels_; 965 std::vector<FakeDataMediaChannel*> channels_;
950 std::vector<DataCodec> data_codecs_; 966 std::vector<DataCodec> data_codecs_;
951 }; 967 };
952 968
953 } // namespace cricket 969 } // namespace cricket
954 970
955 #endif // WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_ 971 #endif // WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/codec.h ('k') | webrtc/ortc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698