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

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

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Also reverting https://codereview.webrtc.org/2612963002 Created 3 years, 11 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 | « webrtc/media/BUILD.gn ('k') | webrtc/media/base/hybriddataengine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/fakemediaengine.h
diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
index cbd4e6ef268046de645d5843582fc24c4af8a2dd..932427b9b41ef845dbab57da9a1e84d5fb01d649 100644
--- a/webrtc/media/base/fakemediaengine.h
+++ b/webrtc/media/base/fakemediaengine.h
@@ -942,9 +942,11 @@ inline FakeVideoMediaChannel::~FakeVideoMediaChannel() {
class FakeDataEngine : public DataEngineInterface {
public:
- FakeDataEngine(){};
+ FakeDataEngine() : last_channel_type_(DCT_NONE) {}
- virtual DataMediaChannel* CreateChannel(const MediaConfig& config) {
+ virtual DataMediaChannel* CreateChannel(DataChannelType data_channel_type,
+ const MediaConfig& config) {
+ last_channel_type_ = data_channel_type;
FakeDataMediaChannel* ch = new FakeDataMediaChannel(this, DataOptions());
channels_.push_back(ch);
return ch;
@@ -964,9 +966,12 @@ class FakeDataEngine : public DataEngineInterface {
virtual const std::vector<DataCodec>& data_codecs() { return data_codecs_; }
+ DataChannelType last_channel_type() const { return last_channel_type_; }
+
private:
std::vector<FakeDataMediaChannel*> channels_;
std::vector<DataCodec> data_codecs_;
+ DataChannelType last_channel_type_;
};
} // namespace cricket
« no previous file with comments | « webrtc/media/BUILD.gn ('k') | webrtc/media/base/hybriddataengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698