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

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

Issue 1334793003: Remove VideoMediaChannel::SetRender(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove IsReadyToReceive from logging Created 5 years, 3 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 | « no previous file | talk/media/base/mediachannel.h » ('j') | talk/session/media/channel_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 return RtpHelper<VideoMediaChannel>::RemoveSendStream(ssrc); 532 return RtpHelper<VideoMediaChannel>::RemoveSendStream(ssrc);
533 } 533 }
534 534
535 virtual bool GetSendCodec(VideoCodec* send_codec) { 535 virtual bool GetSendCodec(VideoCodec* send_codec) {
536 if (send_codecs_.empty()) { 536 if (send_codecs_.empty()) {
537 return false; 537 return false;
538 } 538 }
539 *send_codec = send_codecs_[0]; 539 *send_codec = send_codecs_[0];
540 return true; 540 return true;
541 } 541 }
542 virtual bool SetRender(bool render) {
543 set_playout(render);
544 return true;
545 }
546 virtual bool SetRenderer(uint32 ssrc, VideoRenderer* r) { 542 virtual bool SetRenderer(uint32 ssrc, VideoRenderer* r) {
547 if (ssrc != 0 && renderers_.find(ssrc) == renderers_.end()) { 543 if (ssrc != 0 && renderers_.find(ssrc) == renderers_.end()) {
548 return false; 544 return false;
549 } 545 }
550 if (ssrc != 0) { 546 if (ssrc != 0) {
551 renderers_[ssrc] = r; 547 renderers_[ssrc] = r;
552 } 548 }
553 return true; 549 return true;
554 } 550 }
555 551
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 1019
1024 private: 1020 private:
1025 std::vector<FakeDataMediaChannel*> channels_; 1021 std::vector<FakeDataMediaChannel*> channels_;
1026 std::vector<DataCodec> data_codecs_; 1022 std::vector<DataCodec> data_codecs_;
1027 DataChannelType last_channel_type_; 1023 DataChannelType last_channel_type_;
1028 }; 1024 };
1029 1025
1030 } // namespace cricket 1026 } // namespace cricket
1031 1027
1032 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_ 1028 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/base/mediachannel.h » ('j') | talk/session/media/channel_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698