Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 bool recv_audio; | 137 bool recv_audio; |
| 138 bool recv_video; | 138 bool recv_video; |
| 139 DataChannelType data_channel_type; | 139 DataChannelType data_channel_type; |
| 140 bool is_muc; | 140 bool is_muc; |
| 141 bool vad_enabled; | 141 bool vad_enabled; |
| 142 bool rtcp_mux_enabled; | 142 bool rtcp_mux_enabled; |
| 143 bool bundle_enabled; | 143 bool bundle_enabled; |
| 144 // bps. -1 == auto. | 144 // bps. -1 == auto. |
| 145 int video_bandwidth; | 145 int video_bandwidth; |
| 146 int data_bandwidth; | 146 int data_bandwidth; |
| 147 TransportOptions transport_options; | 147 TransportOptions audio_transport_options; |
| 148 TransportOptions video_transport_options; | |
| 149 TransportOptions data_transport_options; | |
|
pthatcher1
2015/12/11 03:16:09
At first pass, this feels ugly, especially if we w
Taylor Brandstetter
2015/12/11 18:40:02
I had the same thought. But my reasons for not doi
| |
| 148 | 150 |
| 149 struct Stream { | 151 struct Stream { |
| 150 Stream(MediaType type, | 152 Stream(MediaType type, |
| 151 const std::string& id, | 153 const std::string& id, |
| 152 const std::string& sync_label, | 154 const std::string& sync_label, |
| 153 int num_sim_layers) | 155 int num_sim_layers) |
| 154 : type(type), id(id), sync_label(sync_label), | 156 : type(type), id(id), sync_label(sync_label), |
| 155 num_sim_layers(num_sim_layers) { | 157 num_sim_layers(num_sim_layers) { |
| 156 } | 158 } |
| 157 MediaType type; | 159 MediaType type; |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 552 void GetSupportedVideoCryptoSuiteNames( | 554 void GetSupportedVideoCryptoSuiteNames( |
| 553 std::vector<std::string>* crypto_suite_names); | 555 std::vector<std::string>* crypto_suite_names); |
| 554 void GetSupportedDataCryptoSuiteNames( | 556 void GetSupportedDataCryptoSuiteNames( |
| 555 std::vector<std::string>* crypto_suite_names); | 557 std::vector<std::string>* crypto_suite_names); |
| 556 void GetDefaultSrtpCryptoSuiteNames( | 558 void GetDefaultSrtpCryptoSuiteNames( |
| 557 std::vector<std::string>* crypto_suite_names); | 559 std::vector<std::string>* crypto_suite_names); |
| 558 | 560 |
| 559 } // namespace cricket | 561 } // namespace cricket |
| 560 | 562 |
| 561 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ | 563 #endif // TALK_SESSION_MEDIA_MEDIASESSION_H_ |
| OLD | NEW |