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

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

Issue 1528843005: Add support for GCM cipher suites from RFC 7714. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 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 unified diff | Download patch
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 bool recv_audio; 141 bool recv_audio;
142 bool recv_video; 142 bool recv_video;
143 DataChannelType data_channel_type; 143 DataChannelType data_channel_type;
144 bool is_muc; 144 bool is_muc;
145 bool vad_enabled; 145 bool vad_enabled;
146 bool rtcp_mux_enabled; 146 bool rtcp_mux_enabled;
147 bool bundle_enabled; 147 bool bundle_enabled;
148 // bps. -1 == auto. 148 // bps. -1 == auto.
149 int video_bandwidth; 149 int video_bandwidth;
150 int data_bandwidth; 150 int data_bandwidth;
151 rtc::CryptoOptions crypto_options;
151 TransportOptions audio_transport_options; 152 TransportOptions audio_transport_options;
152 TransportOptions video_transport_options; 153 TransportOptions video_transport_options;
153 TransportOptions data_transport_options; 154 TransportOptions data_transport_options;
154 155
155 struct Stream { 156 struct Stream {
156 Stream(MediaType type, 157 Stream(MediaType type,
157 const std::string& id, 158 const std::string& id,
158 const std::string& sync_label, 159 const std::string& sync_label,
159 int num_sim_layers) 160 int num_sim_layers)
160 : type(type), id(id), sync_label(sync_label), 161 : type(type), id(id), sync_label(sync_label),
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc); 543 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc);
543 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc); 544 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc);
544 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc); 545 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc);
545 const AudioContentDescription* GetFirstAudioContentDescription( 546 const AudioContentDescription* GetFirstAudioContentDescription(
546 const SessionDescription* sdesc); 547 const SessionDescription* sdesc);
547 const VideoContentDescription* GetFirstVideoContentDescription( 548 const VideoContentDescription* GetFirstVideoContentDescription(
548 const SessionDescription* sdesc); 549 const SessionDescription* sdesc);
549 const DataContentDescription* GetFirstDataContentDescription( 550 const DataContentDescription* GetFirstDataContentDescription(
550 const SessionDescription* sdesc); 551 const SessionDescription* sdesc);
551 552
552 void GetSupportedAudioCryptoSuites(std::vector<int>* crypto_suites); 553 void GetSupportedAudioCryptoSuites(const rtc::CryptoOptions& crypto_options,
553 void GetSupportedVideoCryptoSuites(std::vector<int>* crypto_suites); 554 std::vector<int>* crypto_suites);
554 void GetSupportedDataCryptoSuites(std::vector<int>* crypto_suites); 555 void GetSupportedVideoCryptoSuites(const rtc::CryptoOptions& crypto_options,
555 void GetDefaultSrtpCryptoSuites(std::vector<int>* crypto_suites); 556 std::vector<int>* crypto_suites);
556 void GetSupportedAudioCryptoSuiteNames( 557 void GetSupportedDataCryptoSuites(const rtc::CryptoOptions& crypto_options,
558 std::vector<int>* crypto_suites);
559 void GetDefaultSrtpCryptoSuites(const rtc::CryptoOptions& crypto_options,
560 std::vector<int>* crypto_suites);
561 void GetSupportedAudioCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
557 std::vector<std::string>* crypto_suite_names); 562 std::vector<std::string>* crypto_suite_names);
558 void GetSupportedVideoCryptoSuiteNames( 563 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
559 std::vector<std::string>* crypto_suite_names); 564 std::vector<std::string>* crypto_suite_names);
560 void GetSupportedDataCryptoSuiteNames( 565 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
561 std::vector<std::string>* crypto_suite_names); 566 std::vector<std::string>* crypto_suite_names);
562 void GetDefaultSrtpCryptoSuiteNames( 567 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
563 std::vector<std::string>* crypto_suite_names); 568 std::vector<std::string>* crypto_suite_names);
564 569
565 } // namespace cricket 570 } // namespace cricket
566 571
567 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ 572 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698