Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Rebase onto cleanup change 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
OLDNEW
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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 289
290 size_t RTPSender::RtpHeaderExtensionTotalLength() const { 290 size_t RTPSender::RtpHeaderExtensionTotalLength() const {
291 CriticalSectionScoped cs(send_critsect_.get()); 291 CriticalSectionScoped cs(send_critsect_.get());
292 return rtp_header_extension_map_.GetTotalLengthInBytes(); 292 return rtp_header_extension_map_.GetTotalLengthInBytes();
293 } 293 }
294 294
295 int32_t RTPSender::RegisterPayload( 295 int32_t RTPSender::RegisterPayload(
296 const char payload_name[RTP_PAYLOAD_NAME_SIZE], 296 const char payload_name[RTP_PAYLOAD_NAME_SIZE],
297 int8_t payload_number, 297 int8_t payload_number,
298 uint32_t frequency, 298 uint32_t frequency,
299 uint8_t channels, 299 size_t channels,
300 uint32_t rate) { 300 uint32_t rate) {
301 assert(payload_name); 301 assert(payload_name);
302 CriticalSectionScoped cs(send_critsect_.get()); 302 CriticalSectionScoped cs(send_critsect_.get());
303 303
304 std::map<int8_t, RtpUtility::Payload*>::iterator it = 304 std::map<int8_t, RtpUtility::Payload*>::iterator it =
305 payload_type_map_.find(payload_number); 305 payload_type_map_.find(payload_number);
306 306
307 if (payload_type_map_.end() != it) { 307 if (payload_type_map_.end() != it) {
308 // We already use this payload type. 308 // We already use this payload type.
309 RtpUtility::Payload* payload = it->second; 309 RtpUtility::Payload* payload = it->second;
(...skipping 1597 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 CriticalSectionScoped lock(send_critsect_.get()); 1907 CriticalSectionScoped lock(send_critsect_.get());
1908 1908
1909 RtpState state; 1909 RtpState state;
1910 state.sequence_number = sequence_number_rtx_; 1910 state.sequence_number = sequence_number_rtx_;
1911 state.start_timestamp = start_timestamp_; 1911 state.start_timestamp = start_timestamp_;
1912 1912
1913 return state; 1913 return state;
1914 } 1914 }
1915 1915
1916 } // namespace webrtc 1916 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698