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

Side by Side Diff: webrtc/pc/channel.h

Issue 2761143002: Support encrypted RTP extensions (RFC 6904) (Closed)
Patch Set: Don't negotiate extension ids in SrtpFilter, more changes after feedback from Taylor. Created 3 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 bool UpdateRemoteStreams_w(const std::vector<StreamParams>& streams, 322 bool UpdateRemoteStreams_w(const std::vector<StreamParams>& streams,
323 ContentAction action, 323 ContentAction action,
324 std::string* error_desc); 324 std::string* error_desc);
325 virtual bool SetLocalContent_w(const MediaContentDescription* content, 325 virtual bool SetLocalContent_w(const MediaContentDescription* content,
326 ContentAction action, 326 ContentAction action,
327 std::string* error_desc) = 0; 327 std::string* error_desc) = 0;
328 virtual bool SetRemoteContent_w(const MediaContentDescription* content, 328 virtual bool SetRemoteContent_w(const MediaContentDescription* content,
329 ContentAction action, 329 ContentAction action,
330 std::string* error_desc) = 0; 330 std::string* error_desc) = 0;
331 bool SetRtpTransportParameters(const MediaContentDescription* content, 331 bool SetRtpTransportParameters(const MediaContentDescription* content,
332 ContentAction action, 332 ContentAction action, ContentSource src,
333 ContentSource src, 333 const RtpHeaderExtensions& extensions, std::string* error_desc);
334 std::string* error_desc);
335 bool SetRtpTransportParameters_n(const MediaContentDescription* content, 334 bool SetRtpTransportParameters_n(const MediaContentDescription* content,
336 ContentAction action, 335 ContentAction action, ContentSource src,
337 ContentSource src, 336 const std::vector<int>& encrypted_extension_ids,
338 std::string* error_desc); 337 std::string* error_desc);
338
339 // Return a list of RTP header extensions with the non-encrypted extensions
340 // removed depending on the current crypto_options_ and only if both the
341 // non-encrypted and encrypted extension is present for the same URI.
342 RtpHeaderExtensions GetFilteredRtpHeaderExtensions(
343 const RtpHeaderExtensions& extensions);
339 344
340 // Helper method to get RTP Absoulute SendTime extension header id if 345 // Helper method to get RTP Absoulute SendTime extension header id if
341 // present in remote supported extensions list. 346 // present in remote supported extensions list.
342 void MaybeCacheRtpAbsSendTimeHeaderExtension_w( 347 void MaybeCacheRtpAbsSendTimeHeaderExtension_w(
343 const std::vector<webrtc::RtpExtension>& extensions); 348 const std::vector<webrtc::RtpExtension>& extensions);
344 349
345 bool CheckSrtpConfig_n(const std::vector<CryptoParams>& cryptos, 350 bool CheckSrtpConfig_n(const std::vector<CryptoParams>& cryptos,
346 bool* dtls, 351 bool* dtls,
347 std::string* error_desc); 352 std::string* error_desc);
348 bool SetSrtp_n(const std::vector<CryptoParams>& params, 353 bool SetSrtp_n(const std::vector<CryptoParams>& params,
349 ContentAction action, 354 ContentAction action,
350 ContentSource src, 355 ContentSource src,
356 const std::vector<int>& encrypted_extension_ids,
351 std::string* error_desc); 357 std::string* error_desc);
352 bool SetRtcpMux_n(bool enable, 358 bool SetRtcpMux_n(bool enable,
353 ContentAction action, 359 ContentAction action,
354 ContentSource src, 360 ContentSource src,
355 std::string* error_desc); 361 std::string* error_desc);
356 362
357 // From MessageHandler 363 // From MessageHandler
358 void OnMessage(rtc::Message* pmsg) override; 364 void OnMessage(rtc::Message* pmsg) override;
359 365
360 const rtc::CryptoOptions& crypto_options() const { 366 const rtc::CryptoOptions& crypto_options() const {
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 // SetSendParameters. 751 // SetSendParameters.
746 DataSendParameters last_send_params_; 752 DataSendParameters last_send_params_;
747 // Last DataRecvParameters sent down to the media_channel() via 753 // Last DataRecvParameters sent down to the media_channel() via
748 // SetRecvParameters. 754 // SetRecvParameters.
749 DataRecvParameters last_recv_params_; 755 DataRecvParameters last_recv_params_;
750 }; 756 };
751 757
752 } // namespace cricket 758 } // namespace cricket
753 759
754 #endif // WEBRTC_PC_CHANNEL_H_ 760 #endif // WEBRTC_PC_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698