OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 return !msid_supported && (default_audio_track_needed || | 280 return !msid_supported && (default_audio_track_needed || |
281 default_video_track_needed); | 281 default_video_track_needed); |
282 } | 282 } |
283 }; | 283 }; |
284 | 284 |
285 struct TrackInfo { | 285 struct TrackInfo { |
286 TrackInfo() : ssrc(0) {} | 286 TrackInfo() : ssrc(0) {} |
287 TrackInfo(const std::string& stream_label, | 287 TrackInfo(const std::string& stream_label, |
288 const std::string track_id, | 288 const std::string track_id, |
289 uint32 ssrc) | 289 uint32 ssrc) |
290 : stream_label(stream_label), | 290 : stream_label(stream_label), track_id(track_id), ssrc(ssrc) {} |
291 track_id(track_id), | |
292 ssrc(ssrc) { | |
293 } | |
294 std::string stream_label; | 291 std::string stream_label; |
295 std::string track_id; | 292 std::string track_id; |
296 uint32 ssrc; | 293 uint32 ssrc; |
297 }; | 294 }; |
298 typedef std::vector<TrackInfo> TrackInfos; | 295 typedef std::vector<TrackInfo> TrackInfos; |
299 | 296 |
300 // Makes sure a MediaStream Track is created for each StreamParam in | 297 // Makes sure a MediaStream Track is created for each StreamParam in |
301 // |streams|. |media_type| is the type of the |streams| and can be either | 298 // |streams|. |media_type| is the type of the |streams| and can be either |
302 // audio or video. | 299 // audio or video. |
303 // If a new MediaStream is created it is added to |new_streams|. | 300 // If a new MediaStream is created it is added to |new_streams|. |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 int last_allocated_sctp_even_sid_; | 394 int last_allocated_sctp_even_sid_; |
398 int last_allocated_sctp_odd_sid_; | 395 int last_allocated_sctp_odd_sid_; |
399 | 396 |
400 RtpDataChannels rtp_data_channels_; | 397 RtpDataChannels rtp_data_channels_; |
401 SctpDataChannels sctp_data_channels_; | 398 SctpDataChannels sctp_data_channels_; |
402 }; | 399 }; |
403 | 400 |
404 } // namespace webrtc | 401 } // namespace webrtc |
405 | 402 |
406 #endif // TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ | 403 #endif // TALK_APP_WEBRTC_MEDIASTREAMSIGNALING_H_ |
OLD | NEW |