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

Side by Side Diff: webrtc/video/vie_channel.h

Issue 1720883002: Move RTCP histograms from vie_channel to video channel stats proxies. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 10 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
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/vie_channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 int SetSendAbsoluteSendTimeStatus(bool enable, int id); 92 int SetSendAbsoluteSendTimeStatus(bool enable, int id);
93 int SetSendVideoRotationStatus(bool enable, int id); 93 int SetSendVideoRotationStatus(bool enable, int id);
94 int SetSendTransportSequenceNumber(bool enable, int id); 94 int SetSendTransportSequenceNumber(bool enable, int id);
95 95
96 RtpState GetRtpStateForSsrc(uint32_t ssrc) const; 96 RtpState GetRtpStateForSsrc(uint32_t ssrc) const;
97 97
98 // Gets send statistics for the rtp and rtx stream. 98 // Gets send statistics for the rtp and rtx stream.
99 void GetSendStreamDataCounters(StreamDataCounters* rtp_counters, 99 void GetSendStreamDataCounters(StreamDataCounters* rtp_counters,
100 StreamDataCounters* rtx_counters) const; 100 StreamDataCounters* rtx_counters) const;
101 101
102 void GetSendRtcpPacketTypeCounter(
103 RtcpPacketTypeCounter* packet_counter) const;
104
105 void GetReceiveRtcpPacketTypeCounter(
106 RtcpPacketTypeCounter* packet_counter) const;
107
108 void RegisterSendSideDelayObserver(SendSideDelayObserver* observer); 102 void RegisterSendSideDelayObserver(SendSideDelayObserver* observer);
109 103
110 // Called on any new send bitrate estimate. 104 // Called on any new send bitrate estimate.
111 void RegisterSendBitrateObserver(BitrateStatisticsObserver* observer); 105 void RegisterSendBitrateObserver(BitrateStatisticsObserver* observer);
112 106
113 // Implements RtpFeedback. 107 // Implements RtpFeedback.
114 int32_t OnInitializeDecoder(const int8_t payload_type, 108 int32_t OnInitializeDecoder(const int8_t payload_type,
115 const char payload_name[RTP_PAYLOAD_NAME_SIZE], 109 const char payload_name[RTP_PAYLOAD_NAME_SIZE],
116 const int frequency, 110 const int frequency,
117 const size_t channels, 111 const size_t channels,
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 269
276 class RegisterableRtcpPacketTypeCounterObserver 270 class RegisterableRtcpPacketTypeCounterObserver
277 : public RegisterableCallback<RtcpPacketTypeCounterObserver> { 271 : public RegisterableCallback<RtcpPacketTypeCounterObserver> {
278 public: 272 public:
279 void RtcpPacketTypesCounterUpdated( 273 void RtcpPacketTypesCounterUpdated(
280 uint32_t ssrc, 274 uint32_t ssrc,
281 const RtcpPacketTypeCounter& packet_counter) override { 275 const RtcpPacketTypeCounter& packet_counter) override {
282 rtc::CritScope lock(&critsect_); 276 rtc::CritScope lock(&critsect_);
283 if (callback_) 277 if (callback_)
284 callback_->RtcpPacketTypesCounterUpdated(ssrc, packet_counter); 278 callback_->RtcpPacketTypesCounterUpdated(ssrc, packet_counter);
285 counter_map_[ssrc] = packet_counter;
286 }
287
288 virtual std::map<uint32_t, RtcpPacketTypeCounter> GetPacketTypeCounterMap()
289 const {
290 rtc::CritScope lock(&critsect_);
291 return counter_map_;
292 } 279 }
293 280
294 private: 281 private:
295 std::map<uint32_t, RtcpPacketTypeCounter> counter_map_
296 GUARDED_BY(critsect_);
297 } rtcp_packet_type_counter_observer_; 282 } rtcp_packet_type_counter_observer_;
298 283
299 const bool sender_; 284 const bool sender_;
300 285
301 ProcessThread* const module_process_thread_; 286 ProcessThread* const module_process_thread_;
302 PayloadRouter* const send_payload_router_; 287 PayloadRouter* const send_payload_router_;
303 288
304 // Used for all registered callbacks except rendering. 289 // Used for all registered callbacks except rendering.
305 rtc::CriticalSection crit_; 290 rtc::CriticalSection crit_;
306 291
(...skipping 25 matching lines...) Expand all
332 int64_t last_rtt_ms_ GUARDED_BY(crit_); 317 int64_t last_rtt_ms_ GUARDED_BY(crit_);
333 318
334 // RtpRtcp modules, declared last as they use other members on construction. 319 // RtpRtcp modules, declared last as they use other members on construction.
335 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 320 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
336 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); 321 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
337 }; 322 };
338 323
339 } // namespace webrtc 324 } // namespace webrtc
340 325
341 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_ 326 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/vie_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698