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

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

Issue 1877253002: Replaced CriticalSectionWrapper with rtc::CriticalSection in rtp_rtcp module (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: git cl format dtmf_queue.cc 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
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 uint16_t transport_sequence_number_; 447 uint16_t transport_sequence_number_;
448 448
449 // NACK 449 // NACK
450 uint32_t nack_byte_count_times_[NACK_BYTECOUNT_SIZE]; 450 uint32_t nack_byte_count_times_[NACK_BYTECOUNT_SIZE];
451 size_t nack_byte_count_[NACK_BYTECOUNT_SIZE]; 451 size_t nack_byte_count_[NACK_BYTECOUNT_SIZE];
452 Bitrate nack_bitrate_; 452 Bitrate nack_bitrate_;
453 453
454 RTPPacketHistory packet_history_; 454 RTPPacketHistory packet_history_;
455 455
456 // Statistics 456 // Statistics
457 rtc::scoped_ptr<CriticalSectionWrapper> statistics_crit_; 457 rtc::CriticalSection statistics_crit_;
458 SendDelayMap send_delays_ GUARDED_BY(statistics_crit_); 458 SendDelayMap send_delays_ GUARDED_BY(statistics_crit_);
459 FrameCounts frame_counts_ GUARDED_BY(statistics_crit_); 459 FrameCounts frame_counts_ GUARDED_BY(statistics_crit_);
460 StreamDataCounters rtp_stats_ GUARDED_BY(statistics_crit_); 460 StreamDataCounters rtp_stats_ GUARDED_BY(statistics_crit_);
461 StreamDataCounters rtx_rtp_stats_ GUARDED_BY(statistics_crit_); 461 StreamDataCounters rtx_rtp_stats_ GUARDED_BY(statistics_crit_);
462 StreamDataCountersCallback* rtp_stats_callback_ GUARDED_BY(statistics_crit_); 462 StreamDataCountersCallback* rtp_stats_callback_ GUARDED_BY(statistics_crit_);
463 FrameCountObserver* const frame_count_observer_; 463 FrameCountObserver* const frame_count_observer_;
464 SendSideDelayObserver* const send_side_delay_observer_; 464 SendSideDelayObserver* const send_side_delay_observer_;
465 RtcEventLog* const event_log_; 465 RtcEventLog* const event_log_;
466 466
467 // RTP variables 467 // RTP variables
(...skipping 14 matching lines...) Expand all
482 std::vector<uint32_t> csrcs_ GUARDED_BY(send_critsect_); 482 std::vector<uint32_t> csrcs_ GUARDED_BY(send_critsect_);
483 int rtx_ GUARDED_BY(send_critsect_); 483 int rtx_ GUARDED_BY(send_critsect_);
484 uint32_t ssrc_rtx_ GUARDED_BY(send_critsect_); 484 uint32_t ssrc_rtx_ GUARDED_BY(send_critsect_);
485 // Mapping rtx_payload_type_map_[associated] = rtx. 485 // Mapping rtx_payload_type_map_[associated] = rtx.
486 std::map<int8_t, int8_t> rtx_payload_type_map_ GUARDED_BY(send_critsect_); 486 std::map<int8_t, int8_t> rtx_payload_type_map_ GUARDED_BY(send_critsect_);
487 487
488 // Note: Don't access this variable directly, always go through 488 // Note: Don't access this variable directly, always go through
489 // SetTargetBitrateKbps or GetTargetBitrateKbps. Also remember 489 // SetTargetBitrateKbps or GetTargetBitrateKbps. Also remember
490 // that by the time the function returns there is no guarantee 490 // that by the time the function returns there is no guarantee
491 // that the target bitrate is still valid. 491 // that the target bitrate is still valid.
492 rtc::scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_; 492 rtc::CriticalSection target_bitrate_critsect_;
493 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); 493 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_);
494 494
495 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender); 495 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
496 }; 496 };
497 497
498 } // namespace webrtc 498 } // namespace webrtc
499 499
500 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 500 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698