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

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 fake SetRender 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.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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 } 545 }
546 return true; 546 return true;
547 } 547 }
548 virtual bool GetSendCodec(VideoCodec* send_codec) { 548 virtual bool GetSendCodec(VideoCodec* send_codec) {
549 if (send_codecs_.empty()) { 549 if (send_codecs_.empty()) {
550 return false; 550 return false;
551 } 551 }
552 *send_codec = send_codecs_[0]; 552 *send_codec = send_codecs_[0];
553 return true; 553 return true;
554 } 554 }
555 virtual bool SetRender(bool render) {
556 set_playout(render);
557 return true;
558 }
559 virtual bool SetRenderer(uint32 ssrc, VideoRenderer* r) { 555 virtual bool SetRenderer(uint32 ssrc, VideoRenderer* r) {
560 if (ssrc != 0 && renderers_.find(ssrc) == renderers_.end()) { 556 if (ssrc != 0 && renderers_.find(ssrc) == renderers_.end()) {
561 return false; 557 return false;
562 } 558 }
563 if (ssrc != 0) { 559 if (ssrc != 0) {
564 renderers_[ssrc] = r; 560 renderers_[ssrc] = r;
565 } 561 }
566 return true; 562 return true;
567 } 563 }
568 564
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 1055
1060 private: 1056 private:
1061 std::vector<FakeDataMediaChannel*> channels_; 1057 std::vector<FakeDataMediaChannel*> channels_;
1062 std::vector<DataCodec> data_codecs_; 1058 std::vector<DataCodec> data_codecs_;
1063 DataChannelType last_channel_type_; 1059 DataChannelType last_channel_type_;
1064 }; 1060 };
1065 1061
1066 } // namespace cricket 1062 } // namespace cricket
1067 1063
1068 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_ 1064 #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.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698