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

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

Issue 1539423003: [rtp_rtcp] Lint errors cleaned from rtp_utility (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 kRtpExtensionVideoRotation)); 297 kRtpExtensionVideoRotation));
298 } else if (cvo_mode == RTPSenderInterface::kCVOActivated) { 298 } else if (cvo_mode == RTPSenderInterface::kCVOActivated) {
299 // Checking whether CVO header extension is registered will require taking 299 // Checking whether CVO header extension is registered will require taking
300 // a lock. It'll be a no-op if it's not registered. 300 // a lock. It'll be a no-op if it's not registered.
301 // TODO(guoweis): For now, all packets sent will carry the CVO such that 301 // TODO(guoweis): For now, all packets sent will carry the CVO such that
302 // the RTP header length is consistent, although the receiver side will 302 // the RTP header length is consistent, although the receiver side will
303 // only exam the packets with marker bit set. 303 // only exam the packets with marker bit set.
304 size_t packetSize = payloadSize + rtp_header_length; 304 size_t packetSize = payloadSize + rtp_header_length;
305 RtpUtility::RtpHeaderParser rtp_parser(dataBuffer, packetSize); 305 RtpUtility::RtpHeaderParser rtp_parser(dataBuffer, packetSize);
306 RTPHeader rtp_header; 306 RTPHeader rtp_header;
307 rtp_parser.Parse(rtp_header); 307 rtp_parser.Parse(&rtp_header);
308 _rtpSender.UpdateVideoRotation(dataBuffer, packetSize, rtp_header, 308 _rtpSender.UpdateVideoRotation(dataBuffer, packetSize, rtp_header,
309 rtpHdr->rotation); 309 rtpHdr->rotation);
310 } 310 }
311 if (fec_enabled) { 311 if (fec_enabled) {
312 SendVideoPacketAsRed(dataBuffer, payload_bytes_in_packet, 312 SendVideoPacketAsRed(dataBuffer, payload_bytes_in_packet,
313 rtp_header_length, _rtpSender.SequenceNumber(), 313 rtp_header_length, _rtpSender.SequenceNumber(),
314 captureTimeStamp, capture_time_ms, storage, 314 captureTimeStamp, capture_time_ms, storage,
315 packetizer->GetProtectionType() == kProtectedPacket); 315 packetizer->GetProtectionType() == kProtectedPacket);
316 } else { 316 } else {
317 SendVideoPacket(dataBuffer, payload_bytes_in_packet, rtp_header_length, 317 SendVideoPacket(dataBuffer, payload_bytes_in_packet, rtp_header_length,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 CriticalSectionScoped cs(crit_.get()); 350 CriticalSectionScoped cs(crit_.get());
351 return _retransmissionSettings; 351 return _retransmissionSettings;
352 } 352 }
353 353
354 void RTPSenderVideo::SetSelectiveRetransmissions(uint8_t settings) { 354 void RTPSenderVideo::SetSelectiveRetransmissions(uint8_t settings) {
355 CriticalSectionScoped cs(crit_.get()); 355 CriticalSectionScoped cs(crit_.get());
356 _retransmissionSettings = settings; 356 _retransmissionSettings = settings;
357 } 357 }
358 358
359 } // namespace webrtc 359 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_utility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698