| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 | 271 |
| 272 size_t RTPSender::RtpHeaderExtensionTotalLength() const { | 272 size_t RTPSender::RtpHeaderExtensionTotalLength() const { |
| 273 CriticalSectionScoped cs(send_critsect_.get()); | 273 CriticalSectionScoped cs(send_critsect_.get()); |
| 274 return rtp_header_extension_map_.GetTotalLengthInBytes(); | 274 return rtp_header_extension_map_.GetTotalLengthInBytes(); |
| 275 } | 275 } |
| 276 | 276 |
| 277 int32_t RTPSender::RegisterPayload( | 277 int32_t RTPSender::RegisterPayload( |
| 278 const char payload_name[RTP_PAYLOAD_NAME_SIZE], | 278 const char payload_name[RTP_PAYLOAD_NAME_SIZE], |
| 279 int8_t payload_number, | 279 int8_t payload_number, |
| 280 uint32_t frequency, | 280 uint32_t frequency, |
| 281 uint8_t channels, | 281 size_t channels, |
| 282 uint32_t rate) { | 282 uint32_t rate) { |
| 283 assert(payload_name); | 283 assert(payload_name); |
| 284 CriticalSectionScoped cs(send_critsect_.get()); | 284 CriticalSectionScoped cs(send_critsect_.get()); |
| 285 | 285 |
| 286 std::map<int8_t, RtpUtility::Payload*>::iterator it = | 286 std::map<int8_t, RtpUtility::Payload*>::iterator it = |
| 287 payload_type_map_.find(payload_number); | 287 payload_type_map_.find(payload_number); |
| 288 | 288 |
| 289 if (payload_type_map_.end() != it) { | 289 if (payload_type_map_.end() != it) { |
| 290 // We already use this payload type. | 290 // We already use this payload type. |
| 291 RtpUtility::Payload* payload = it->second; | 291 RtpUtility::Payload* payload = it->second; |
| (...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1849 CriticalSectionScoped lock(send_critsect_.get()); | 1849 CriticalSectionScoped lock(send_critsect_.get()); |
| 1850 | 1850 |
| 1851 RtpState state; | 1851 RtpState state; |
| 1852 state.sequence_number = sequence_number_rtx_; | 1852 state.sequence_number = sequence_number_rtx_; |
| 1853 state.start_timestamp = start_timestamp_; | 1853 state.start_timestamp = start_timestamp_; |
| 1854 | 1854 |
| 1855 return state; | 1855 return state; |
| 1856 } | 1856 } |
| 1857 | 1857 |
| 1858 } // namespace webrtc | 1858 } // namespace webrtc |
| OLD | NEW |