OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 28 matching lines...) Expand all Loading... |
39 public RtcpPacketTypeCounterObserver, | 39 public RtcpPacketTypeCounterObserver, |
40 public StreamDataCountersCallback, | 40 public StreamDataCountersCallback, |
41 public CallStatsObserver { | 41 public CallStatsObserver { |
42 public: | 42 public: |
43 ReceiveStatisticsProxy(const VideoReceiveStream::Config* config, | 43 ReceiveStatisticsProxy(const VideoReceiveStream::Config* config, |
44 Clock* clock); | 44 Clock* clock); |
45 virtual ~ReceiveStatisticsProxy(); | 45 virtual ~ReceiveStatisticsProxy(); |
46 | 46 |
47 VideoReceiveStream::Stats GetStats() const; | 47 VideoReceiveStream::Stats GetStats() const; |
48 | 48 |
| 49 rtc::Optional<TimingFrameInfo> GetAndResetTimingFrameInfo(); |
| 50 |
49 void OnDecodedFrame(rtc::Optional<uint8_t> qp, VideoContentType content_type); | 51 void OnDecodedFrame(rtc::Optional<uint8_t> qp, VideoContentType content_type); |
50 void OnSyncOffsetUpdated(int64_t sync_offset_ms, double estimated_freq_khz); | 52 void OnSyncOffsetUpdated(int64_t sync_offset_ms, double estimated_freq_khz); |
51 void OnRenderedFrame(const VideoFrame& frame); | 53 void OnRenderedFrame(const VideoFrame& frame); |
52 void OnIncomingPayloadType(int payload_type); | 54 void OnIncomingPayloadType(int payload_type); |
53 void OnDecoderImplementationName(const char* implementation_name); | 55 void OnDecoderImplementationName(const char* implementation_name); |
54 void OnIncomingRate(unsigned int framerate, unsigned int bitrate_bps); | 56 void OnIncomingRate(unsigned int framerate, unsigned int bitrate_bps); |
55 | 57 |
56 void OnPreDecode(const EncodedImage& encoded_image, | 58 void OnPreDecode(const EncodedImage& encoded_image, |
57 const CodecSpecificInfo* codec_specific_info); | 59 const CodecSpecificInfo* codec_specific_info); |
58 | 60 |
59 // Overrides VCMReceiveStatisticsCallback. | 61 // Overrides VCMReceiveStatisticsCallback. |
60 void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) override; | 62 void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) override; |
61 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; | 63 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; |
62 void OnDiscardedPacketsUpdated(int discarded_packets) override; | 64 void OnDiscardedPacketsUpdated(int discarded_packets) override; |
63 void OnCompleteFrame(bool is_keyframe, size_t size_bytes) override; | 65 void OnCompleteFrame(bool is_keyframe, size_t size_bytes) override; |
64 void OnFrameBufferTimingsUpdated(int decode_ms, | 66 void OnFrameBufferTimingsUpdated(int decode_ms, |
65 int max_decode_ms, | 67 int max_decode_ms, |
66 int current_delay_ms, | 68 int current_delay_ms, |
67 int target_delay_ms, | 69 int target_delay_ms, |
68 int jitter_buffer_ms, | 70 int jitter_buffer_ms, |
69 int min_playout_delay_ms, | 71 int min_playout_delay_ms, |
70 int render_delay_ms) override; | 72 int render_delay_ms) override; |
71 | 73 |
| 74 void OnTimingFrameInfoUpdated(const TimingFrameInfo& info) override; |
| 75 |
72 // Overrides RtcpStatisticsCallback. | 76 // Overrides RtcpStatisticsCallback. |
73 void StatisticsUpdated(const webrtc::RtcpStatistics& statistics, | 77 void StatisticsUpdated(const webrtc::RtcpStatistics& statistics, |
74 uint32_t ssrc) override; | 78 uint32_t ssrc) override; |
75 void CNameChanged(const char* cname, uint32_t ssrc) override; | 79 void CNameChanged(const char* cname, uint32_t ssrc) override; |
76 | 80 |
77 // Overrides RtcpPacketTypeCounterObserver. | 81 // Overrides RtcpPacketTypeCounterObserver. |
78 void RtcpPacketTypesCounterUpdated( | 82 void RtcpPacketTypesCounterUpdated( |
79 uint32_t ssrc, | 83 uint32_t ssrc, |
80 const RtcpPacketTypeCounter& packet_counter) override; | 84 const RtcpPacketTypeCounter& packet_counter) override; |
81 // Overrides StreamDataCountersCallback. | 85 // Overrides StreamDataCountersCallback. |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 int64_t interframe_delay_max_ms_screenshare_ GUARDED_BY(crit_); | 154 int64_t interframe_delay_max_ms_screenshare_ GUARDED_BY(crit_); |
151 MaxCounter freq_offset_counter_ GUARDED_BY(crit_); | 155 MaxCounter freq_offset_counter_ GUARDED_BY(crit_); |
152 int64_t first_report_block_time_ms_ GUARDED_BY(crit_); | 156 int64_t first_report_block_time_ms_ GUARDED_BY(crit_); |
153 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); | 157 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); |
154 QpCounters qp_counters_; // Only accessed on the decoding thread. | 158 QpCounters qp_counters_; // Only accessed on the decoding thread. |
155 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); | 159 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); |
156 int64_t avg_rtt_ms_ GUARDED_BY(crit_); | 160 int64_t avg_rtt_ms_ GUARDED_BY(crit_); |
157 mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_); | 161 mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_); |
158 VideoContentType last_content_type_ GUARDED_BY(&crit_); | 162 VideoContentType last_content_type_ GUARDED_BY(&crit_); |
159 rtc::Optional<int64_t> last_decoded_frame_time_ms_; | 163 rtc::Optional<int64_t> last_decoded_frame_time_ms_; |
| 164 rtc::Optional<TimingFrameInfo> timing_frame_info_ GUARDED_BY(&crit_); |
160 }; | 165 }; |
161 | 166 |
162 } // namespace webrtc | 167 } // namespace webrtc |
163 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ | 168 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ |
OLD | NEW |