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

Side by Side Diff: talk/media/sctp/sctpdataengine.h

Issue 1324853003: Remove MediaChannel::GetOptions(). (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/media/base/mediachannel.h ('k') | talk/media/webrtc/webrtcvideoengine2.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 2012 Google Inc. and Robin Seggelmann 3 * Copyright 2012 Google Inc. and Robin Seggelmann
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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 SendDataResult* result = NULL); 164 SendDataResult* result = NULL);
165 // A packet is received from the network interface. Posted to OnMessage. 165 // A packet is received from the network interface. Posted to OnMessage.
166 virtual void OnPacketReceived(rtc::Buffer* packet, 166 virtual void OnPacketReceived(rtc::Buffer* packet,
167 const rtc::PacketTime& packet_time); 167 const rtc::PacketTime& packet_time);
168 168
169 // Exposed to allow Post call from c-callbacks. 169 // Exposed to allow Post call from c-callbacks.
170 rtc::Thread* worker_thread() const { return worker_thread_; } 170 rtc::Thread* worker_thread() const { return worker_thread_; }
171 171
172 // TODO(ldixon): add a DataOptions class to mediachannel.h 172 // TODO(ldixon): add a DataOptions class to mediachannel.h
173 virtual bool SetOptions(int options) { return false; } 173 virtual bool SetOptions(int options) { return false; }
174 virtual int GetOptions() const { return 0; }
175 174
176 // Many of these things are unused by SCTP, but are needed to fulfill 175 // Many of these things are unused by SCTP, but are needed to fulfill
177 // the MediaChannel interface. 176 // the MediaChannel interface.
178 // TODO(pthatcher): Cleanup MediaChannel interface, or at least 177 // TODO(pthatcher): Cleanup MediaChannel interface, or at least
179 // don't try calling these and return false. Right now, things 178 // don't try calling these and return false. Right now, things
180 // don't work if we return false. 179 // don't work if we return false.
181 virtual bool SetMaxSendBandwidth(int bps) { return true; } 180 virtual bool SetMaxSendBandwidth(int bps) { return true; }
182 virtual bool SetRecvRtpHeaderExtensions( 181 virtual bool SetRecvRtpHeaderExtensions(
183 const std::vector<RtpHeaderExtension>& extensions) { return true; } 182 const std::vector<RtpHeaderExtension>& extensions) { return true; }
184 virtual bool SetSendRtpHeaderExtensions( 183 virtual bool SetSendRtpHeaderExtensions(
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 StreamSet queued_reset_streams_; 255 StreamSet queued_reset_streams_;
257 StreamSet sent_reset_streams_; 256 StreamSet sent_reset_streams_;
258 257
259 // A human-readable name for debugging messages. 258 // A human-readable name for debugging messages.
260 std::string debug_name_; 259 std::string debug_name_;
261 }; 260 };
262 261
263 } // namespace cricket 262 } // namespace cricket
264 263
265 #endif // TALK_MEDIA_SCTP_SCTPDATAENGINE_H_ 264 #endif // TALK_MEDIA_SCTP_SCTPDATAENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/base/mediachannel.h ('k') | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698