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 1516993002: Properly handle different transports having different SSL roles. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Adding a helper method for GetSslRole, and some more comments. 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
« no previous file with comments | « talk/app/webrtc/webrtcsessiondescriptionfactory.cc ('k') | talk/session/media/mediasession.cc » ('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 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 128
129 // Helper function. 129 // Helper function.
130 void AddSendStreamInternal(MediaType type, 130 void AddSendStreamInternal(MediaType type,
131 const std::string& id, 131 const std::string& id,
132 const std::string& sync_label, 132 const std::string& sync_label,
133 int num_sim_layers); 133 int num_sim_layers);
134 134
135 bool HasSendMediaStream(MediaType type) const; 135 bool HasSendMediaStream(MediaType type) const;
136 136
137 // TODO(deadbeef): Put all the audio/video/data-specific options into a map
138 // structure (content name -> options).
139 // MediaSessionDescriptionFactory assumes there will never be more than one
140 // audio/video/data content, but this will change with unified plan.
137 bool recv_audio; 141 bool recv_audio;
138 bool recv_video; 142 bool recv_video;
139 DataChannelType data_channel_type; 143 DataChannelType data_channel_type;
140 bool is_muc; 144 bool is_muc;
141 bool vad_enabled; 145 bool vad_enabled;
142 bool rtcp_mux_enabled; 146 bool rtcp_mux_enabled;
143 bool bundle_enabled; 147 bool bundle_enabled;
144 // bps. -1 == auto. 148 // bps. -1 == auto.
145 int video_bandwidth; 149 int video_bandwidth;
146 int data_bandwidth; 150 int data_bandwidth;
147 TransportOptions transport_options; 151 TransportOptions audio_transport_options;
152 TransportOptions video_transport_options;
153 TransportOptions data_transport_options;
148 154
149 struct Stream { 155 struct Stream {
150 Stream(MediaType type, 156 Stream(MediaType type,
151 const std::string& id, 157 const std::string& id,
152 const std::string& sync_label, 158 const std::string& sync_label,
153 int num_sim_layers) 159 int num_sim_layers)
154 : type(type), id(id), sync_label(sync_label), 160 : type(type), id(id), sync_label(sync_label),
155 num_sim_layers(num_sim_layers) { 161 num_sim_layers(num_sim_layers) {
156 } 162 }
157 MediaType type; 163 MediaType type;
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 void GetSupportedVideoCryptoSuiteNames( 558 void GetSupportedVideoCryptoSuiteNames(
553 std::vector<std::string>* crypto_suite_names); 559 std::vector<std::string>* crypto_suite_names);
554 void GetSupportedDataCryptoSuiteNames( 560 void GetSupportedDataCryptoSuiteNames(
555 std::vector<std::string>* crypto_suite_names); 561 std::vector<std::string>* crypto_suite_names);
556 void GetDefaultSrtpCryptoSuiteNames( 562 void GetDefaultSrtpCryptoSuiteNames(
557 std::vector<std::string>* crypto_suite_names); 563 std::vector<std::string>* crypto_suite_names);
558 564
559 } // namespace cricket 565 } // namespace cricket
560 566
561 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ 567 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsessiondescriptionfactory.cc ('k') | talk/session/media/mediasession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698