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

Unified Diff: talk/media/base/fakemediaengine.h

Issue 1398823003: Remove MediaChannel::SetRemoteRenderer(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/media/base/mediachannel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/fakemediaengine.h
diff --git a/talk/media/base/fakemediaengine.h b/talk/media/base/fakemediaengine.h
index 3a7d3f063fe8c87bc5019c53a77b7179ba43afa2..2728c7d3254304cf270f91e98f630cb4b74c684d 100644
--- a/talk/media/base/fakemediaengine.h
+++ b/talk/media/base/fakemediaengine.h
@@ -300,24 +300,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
output_scalings_.erase(ssrc);
return true;
}
- virtual bool SetRemoteRenderer(uint32_t ssrc, AudioRenderer* renderer) {
- std::map<uint32_t, AudioRenderer*>::iterator it =
- remote_renderers_.find(ssrc);
- if (renderer) {
- if (it != remote_renderers_.end()) {
- ASSERT(it->second == renderer);
- } else {
- remote_renderers_.insert(std::make_pair(ssrc, renderer));
- }
- } else {
- if (it != remote_renderers_.end()) {
- remote_renderers_.erase(it);
- } else {
- return false;
- }
- }
- return true;
- }
virtual bool GetActiveStreams(AudioInfo::StreamList* streams) { return true; }
virtual int GetOutputLevel() { return 0; }
@@ -439,7 +421,6 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
int time_since_last_typing_;
AudioOptions options_;
std::map<uint32_t, VoiceChannelAudioSink*> local_renderers_;
- std::map<uint32_t, AudioRenderer*> remote_renderers_;
};
// A helper function to compare the FakeVoiceMediaChannel::DtmfInfo.
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/media/base/mediachannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698