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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_utility.h

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_
13 13
14 #include <stddef.h> // size_t, ptrdiff_t 14 #include <stddef.h> // size_t, ptrdiff_t
15 15
16 #include <memory> 16 #include "webrtc/base/scoped_ptr.h"
17
18 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
19 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" 18 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
20 #include "webrtc/typedefs.h" 19 #include "webrtc/typedefs.h"
21 20
22 namespace webrtc { 21 namespace webrtc {
23 namespace rtcp { 22 namespace rtcp {
24 class RtcpPacket; 23 class RtcpPacket;
25 } 24 }
26 namespace RTCPUtility { 25 namespace RTCPUtility {
27 26
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 bool _validPacket; 461 bool _validPacket;
463 const uint8_t* _ptrRTCPData; 462 const uint8_t* _ptrRTCPData;
464 const uint8_t* _ptrRTCPBlockEnd; 463 const uint8_t* _ptrRTCPBlockEnd;
465 464
466 ParseState _state; 465 ParseState _state;
467 uint8_t _numberOfBlocks; 466 uint8_t _numberOfBlocks;
468 size_t num_skipped_blocks_; 467 size_t num_skipped_blocks_;
469 468
470 RTCPPacketTypes _packetType; 469 RTCPPacketTypes _packetType;
471 RTCPPacket _packet; 470 RTCPPacket _packet;
472 std::unique_ptr<webrtc::rtcp::RtcpPacket> rtcp_packet_; 471 rtc::scoped_ptr<webrtc::rtcp::RtcpPacket> rtcp_packet_;
473 }; 472 };
474 473
475 class RTCPPacketIterator { 474 class RTCPPacketIterator {
476 public: 475 public:
477 RTCPPacketIterator(uint8_t* rtcpData, size_t rtcpDataLength); 476 RTCPPacketIterator(uint8_t* rtcpData, size_t rtcpDataLength);
478 ~RTCPPacketIterator(); 477 ~RTCPPacketIterator();
479 478
480 const RtcpCommonHeader* Begin(); 479 const RtcpCommonHeader* Begin();
481 const RtcpCommonHeader* Iterate(); 480 const RtcpCommonHeader* Iterate();
482 const RtcpCommonHeader* Current(); 481 const RtcpCommonHeader* Current();
483 482
484 private: 483 private:
485 uint8_t* const _ptrBegin; 484 uint8_t* const _ptrBegin;
486 uint8_t* const _ptrEnd; 485 uint8_t* const _ptrEnd;
487 486
488 uint8_t* _ptrBlock; 487 uint8_t* _ptrBlock;
489 488
490 RtcpCommonHeader _header; 489 RtcpCommonHeader _header;
491 }; 490 };
492 } // namespace RTCPUtility 491 } // namespace RTCPUtility
493 } // namespace webrtc 492 } // namespace webrtc
494 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_ 493 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_UTILITY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698