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

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

Issue 1331443003: Remove GetOutputScaling from VoiceMediaChannel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 | « talk/app/webrtc/webrtcsession.cc ('k') | talk/media/base/mediachannel.h » ('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 * 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 it->second.right = right; 377 it->second.right = right;
378 } 378 }
379 return true; 379 return true;
380 } else if (output_scalings_.find(ssrc) != output_scalings_.end()) { 380 } else if (output_scalings_.find(ssrc) != output_scalings_.end()) {
381 output_scalings_[ssrc].left = left; 381 output_scalings_[ssrc].left = left;
382 output_scalings_[ssrc].right = right; 382 output_scalings_[ssrc].right = right;
383 return true; 383 return true;
384 } 384 }
385 return false; 385 return false;
386 } 386 }
387 virtual bool GetOutputScaling(uint32 ssrc, double* left, double* right) { 387 bool GetOutputScaling(uint32 ssrc, double* left, double* right) {
388 if (output_scalings_.find(ssrc) == output_scalings_.end()) 388 if (output_scalings_.find(ssrc) == output_scalings_.end())
389 return false; 389 return false;
390 *left = output_scalings_[ssrc].left; 390 *left = output_scalings_[ssrc].left;
391 *right = output_scalings_[ssrc].right; 391 *right = output_scalings_[ssrc].right;
392 return true; 392 return true;
393 } 393 }
394 394
395 virtual bool GetStats(VoiceMediaInfo* info) { return false; } 395 virtual bool GetStats(VoiceMediaInfo* info) { return false; }
396 virtual void GetLastMediaError(uint32* ssrc, 396 virtual void GetLastMediaError(uint32* ssrc,
397 VoiceMediaChannel::Error* error) { 397 VoiceMediaChannel::Error* error) {
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 1052
1053 private: 1053 private:
1054 std::vector<FakeDataMediaChannel*> channels_; 1054 std::vector<FakeDataMediaChannel*> channels_;
1055 std::vector<DataCodec> data_codecs_; 1055 std::vector<DataCodec> data_codecs_;
1056 DataChannelType last_channel_type_; 1056 DataChannelType last_channel_type_;
1057 }; 1057 };
1058 1058
1059 } // namespace cricket 1059 } // namespace cricket
1060 1060
1061 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_ 1061 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession.cc ('k') | talk/media/base/mediachannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698