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

Side by Side Diff: talk/session/media/channel.h

Issue 1417543002: Added override keyword to overridden methods to stop compiler warnings. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove virtual 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 unified diff | Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideoframe.h ('k') | no next file » | 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 void SignalDtlsSetupFailure_w(bool rtcp); 157 void SignalDtlsSetupFailure_w(bool rtcp);
158 void SignalDtlsSetupFailure_s(bool rtcp); 158 void SignalDtlsSetupFailure_s(bool rtcp);
159 159
160 // Used for latency measurements. 160 // Used for latency measurements.
161 sigslot::signal1<BaseChannel*> SignalFirstPacketReceived; 161 sigslot::signal1<BaseChannel*> SignalFirstPacketReceived;
162 162
163 // Made public for easier testing. 163 // Made public for easier testing.
164 void SetReadyToSend(bool rtcp, bool ready); 164 void SetReadyToSend(bool rtcp, bool ready);
165 165
166 // Only public for unit tests. Otherwise, consider protected. 166 // Only public for unit tests. Otherwise, consider protected.
167 virtual int SetOption(SocketType type, rtc::Socket::Option o, int val); 167 int SetOption(SocketType type, rtc::Socket::Option o, int val)
168 override;
168 169
169 SrtpFilter* srtp_filter() { return &srtp_filter_; } 170 SrtpFilter* srtp_filter() { return &srtp_filter_; }
170 171
171 protected: 172 protected:
172 virtual MediaChannel* media_channel() const { return media_channel_; } 173 virtual MediaChannel* media_channel() const { return media_channel_; }
173 // Sets the |transport_channel_| (and |rtcp_transport_channel_|, if |rtcp_| is 174 // Sets the |transport_channel_| (and |rtcp_transport_channel_|, if |rtcp_| is
174 // true). Gets the transport channels from |transport_controller_|. 175 // true). Gets the transport channels from |transport_controller_|.
175 bool SetTransport_w(const std::string& transport_name); 176 bool SetTransport_w(const std::string& transport_name);
176 void set_transport_channel(TransportChannel* transport); 177 void set_transport_channel(TransportChannel* transport);
177 void set_rtcp_transport_channel(TransportChannel* transport); 178 void set_rtcp_transport_channel(TransportChannel* transport);
(...skipping 13 matching lines...) Expand all
191 return transport_controller_->signaling_thread(); 192 return transport_controller_->signaling_thread();
192 } 193 }
193 bool rtcp_transport_enabled() const { return rtcp_transport_enabled_; } 194 bool rtcp_transport_enabled() const { return rtcp_transport_enabled_; }
194 195
195 void ConnectToTransportChannel(TransportChannel* tc); 196 void ConnectToTransportChannel(TransportChannel* tc);
196 void DisconnectFromTransportChannel(TransportChannel* tc); 197 void DisconnectFromTransportChannel(TransportChannel* tc);
197 198
198 void FlushRtcpMessages(); 199 void FlushRtcpMessages();
199 200
200 // NetworkInterface implementation, called by MediaEngine 201 // NetworkInterface implementation, called by MediaEngine
201 virtual bool SendPacket(rtc::Buffer* packet, 202 bool SendPacket(rtc::Buffer* packet,
202 const rtc::PacketOptions& options); 203 const rtc::PacketOptions& options) override;
203 virtual bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options); 204 bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options)
205 override;
204 206
205 // From TransportChannel 207 // From TransportChannel
206 void OnWritableState(TransportChannel* channel); 208 void OnWritableState(TransportChannel* channel);
207 virtual void OnChannelRead(TransportChannel* channel, 209 virtual void OnChannelRead(TransportChannel* channel,
208 const char* data, 210 const char* data,
209 size_t len, 211 size_t len,
210 const rtc::PacketTime& packet_time, 212 const rtc::PacketTime& packet_time,
211 int flags); 213 int flags);
212 void OnReadyToSend(TransportChannel* channel); 214 void OnReadyToSend(TransportChannel* channel);
213 215
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 ContentAction action, 272 ContentAction action,
271 ContentSource src, 273 ContentSource src,
272 std::string* error_desc); 274 std::string* error_desc);
273 void ActivateRtcpMux_w(); 275 void ActivateRtcpMux_w();
274 bool SetRtcpMux_w(bool enable, 276 bool SetRtcpMux_w(bool enable,
275 ContentAction action, 277 ContentAction action,
276 ContentSource src, 278 ContentSource src,
277 std::string* error_desc); 279 std::string* error_desc);
278 280
279 // From MessageHandler 281 // From MessageHandler
280 virtual void OnMessage(rtc::Message* pmsg); 282 void OnMessage(rtc::Message* pmsg) override;
281 283
282 // Handled in derived classes 284 // Handled in derived classes
283 // Get the SRTP ciphers to use for RTP media 285 // Get the SRTP ciphers to use for RTP media
284 virtual void GetSrtpCryptoSuiteNames( 286 virtual void GetSrtpCryptoSuiteNames(
285 std::vector<std::string>* ciphers) const = 0; 287 std::vector<std::string>* ciphers) const = 0;
286 virtual void OnConnectionMonitorUpdate(ConnectionMonitor* monitor, 288 virtual void OnConnectionMonitorUpdate(ConnectionMonitor* monitor,
287 const std::vector<ConnectionInfo>& infos) = 0; 289 const std::vector<ConnectionInfo>& infos) = 0;
288 290
289 // Helper function for invoking bool-returning methods on the worker thread. 291 // Helper function for invoking bool-returning methods on the worker thread.
290 template <class FunctorT> 292 template <class FunctorT>
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 // SetSendParameters. 636 // SetSendParameters.
635 DataSendParameters last_send_params_; 637 DataSendParameters last_send_params_;
636 // Last DataRecvParameters sent down to the media_channel() via 638 // Last DataRecvParameters sent down to the media_channel() via
637 // SetRecvParameters. 639 // SetRecvParameters.
638 DataRecvParameters last_recv_params_; 640 DataRecvParameters last_recv_params_;
639 }; 641 };
640 642
641 } // namespace cricket 643 } // namespace cricket
642 644
643 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 645 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoframe.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698