| Index: webrtc/pc/channelmanager.h
|
| diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
|
| index 15a3752c44a730ae85ecaac07576825a990ffc8c..13cab88134b93a2e65a87b898550bc9c80fc5a18 100644
|
| --- a/webrtc/pc/channelmanager.h
|
| +++ b/webrtc/pc/channelmanager.h
|
| @@ -94,6 +94,7 @@ class ChannelManager {
|
| const std::string& content_name,
|
| const std::string* bundle_transport_name,
|
| bool rtcp,
|
| + bool srtp_required,
|
| const AudioOptions& options);
|
| // Destroys a voice channel created with the Create API.
|
| void DestroyVoiceChannel(VoiceChannel* voice_channel);
|
| @@ -105,6 +106,7 @@ class ChannelManager {
|
| const std::string& content_name,
|
| const std::string* bundle_transport_name,
|
| bool rtcp,
|
| + bool srtp_required,
|
| const VideoOptions& options);
|
| // Destroys a video channel created with the Create API.
|
| void DestroyVideoChannel(VideoChannel* video_channel);
|
| @@ -112,6 +114,7 @@ class ChannelManager {
|
| const std::string& content_name,
|
| const std::string* bundle_transport_name,
|
| bool rtcp,
|
| + bool srtp_required,
|
| DataChannelType data_channel_type);
|
| // Destroys a data channel created with the Create API.
|
| void DestroyDataChannel(DataChannel* data_channel);
|
| @@ -161,6 +164,7 @@ class ChannelManager {
|
| const std::string& content_name,
|
| const std::string* bundle_transport_name,
|
| bool rtcp,
|
| + bool srtp_required,
|
| const AudioOptions& options);
|
| void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
|
| VideoChannel* CreateVideoChannel_w(
|
| @@ -169,12 +173,14 @@ class ChannelManager {
|
| const std::string& content_name,
|
| const std::string* bundle_transport_name,
|
| bool rtcp,
|
| + bool srtp_required,
|
| const VideoOptions& options);
|
| void DestroyVideoChannel_w(VideoChannel* video_channel);
|
| DataChannel* CreateDataChannel_w(TransportController* transport_controller,
|
| const std::string& content_name,
|
| const std::string* bundle_transport_name,
|
| bool rtcp,
|
| + bool srtp_required,
|
| DataChannelType data_channel_type);
|
| void DestroyDataChannel_w(DataChannel* data_channel);
|
|
|
|
|