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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.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, 7 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_RTP_SENDER_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
13 13
14 #include <list> 14 #include <list>
15 #include <map> 15 #include <map>
16 #include <memory>
17 #include <utility> 16 #include <utility>
18 #include <vector> 17 #include <vector>
19 18
20 #include "webrtc/base/constructormagic.h" 19 #include "webrtc/base/constructormagic.h"
21 #include "webrtc/base/criticalsection.h" 20 #include "webrtc/base/criticalsection.h"
22 #include "webrtc/base/random.h" 21 #include "webrtc/base/random.h"
23 #include "webrtc/base/thread_annotations.h" 22 #include "webrtc/base/thread_annotations.h"
24 #include "webrtc/common_types.h" 23 #include "webrtc/common_types.h"
25 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 24 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
26 #include "webrtc/modules/rtp_rtcp/source/bitrate.h" 25 #include "webrtc/modules/rtp_rtcp/source/bitrate.h"
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 }; 416 };
418 417
419 Clock* const clock_; 418 Clock* const clock_;
420 const int64_t clock_delta_ms_; 419 const int64_t clock_delta_ms_;
421 Random random_ GUARDED_BY(send_critsect_); 420 Random random_ GUARDED_BY(send_critsect_);
422 421
423 BitrateAggregator bitrates_; 422 BitrateAggregator bitrates_;
424 Bitrate total_bitrate_sent_; 423 Bitrate total_bitrate_sent_;
425 424
426 const bool audio_configured_; 425 const bool audio_configured_;
427 const std::unique_ptr<RTPSenderAudio> audio_; 426 const rtc::scoped_ptr<RTPSenderAudio> audio_;
428 const std::unique_ptr<RTPSenderVideo> video_; 427 const rtc::scoped_ptr<RTPSenderVideo> video_;
429 428
430 RtpPacketSender* const paced_sender_; 429 RtpPacketSender* const paced_sender_;
431 TransportSequenceNumberAllocator* const transport_sequence_number_allocator_; 430 TransportSequenceNumberAllocator* const transport_sequence_number_allocator_;
432 TransportFeedbackObserver* const transport_feedback_observer_; 431 TransportFeedbackObserver* const transport_feedback_observer_;
433 int64_t last_capture_time_ms_sent_; 432 int64_t last_capture_time_ms_sent_;
434 rtc::CriticalSection send_critsect_; 433 rtc::CriticalSection send_critsect_;
435 434
436 Transport *transport_; 435 Transport *transport_;
437 bool sending_media_ GUARDED_BY(send_critsect_); 436 bool sending_media_ GUARDED_BY(send_critsect_);
438 437
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 // that the target bitrate is still valid. 492 // that the target bitrate is still valid.
494 rtc::CriticalSection target_bitrate_critsect_; 493 rtc::CriticalSection target_bitrate_critsect_;
495 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); 494 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_);
496 495
497 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender); 496 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
498 }; 497 };
499 498
500 } // namespace webrtc 499 } // namespace webrtc
501 500
502 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 501 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698