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

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

Issue 1315413002: Wire up currently-received video codec to stats. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: feedback Created 5 years, 3 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/end_to_end_tests.cc ('k') | webrtc/video/receive_statistics_proxy.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) 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 13 matching lines...) Expand all
24 #include "webrtc/video_engine/vie_channel.h" 24 #include "webrtc/video_engine/vie_channel.h"
25 #include "webrtc/video_receive_stream.h" 25 #include "webrtc/video_receive_stream.h"
26 #include "webrtc/video_renderer.h" 26 #include "webrtc/video_renderer.h"
27 27
28 namespace webrtc { 28 namespace webrtc {
29 29
30 class Clock; 30 class Clock;
31 class ViECodec; 31 class ViECodec;
32 class ViEDecoderObserver; 32 class ViEDecoderObserver;
33 33
34 class ReceiveStatisticsProxy : public ViEDecoderObserver, 34 class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
35 public VCMReceiveStatisticsCallback,
36 public RtcpStatisticsCallback, 35 public RtcpStatisticsCallback,
37 public RtcpPacketTypeCounterObserver, 36 public RtcpPacketTypeCounterObserver,
38 public StreamDataCountersCallback { 37 public StreamDataCountersCallback {
39 public: 38 public:
40 ReceiveStatisticsProxy(uint32_t ssrc, Clock* clock); 39 ReceiveStatisticsProxy(uint32_t ssrc, Clock* clock);
41 virtual ~ReceiveStatisticsProxy(); 40 virtual ~ReceiveStatisticsProxy();
42 41
43 VideoReceiveStream::Stats GetStats() const; 42 VideoReceiveStream::Stats GetStats() const;
44 43
45 void OnDecodedFrame(); 44 void OnDecodedFrame();
46 void OnRenderedFrame(int width, int height); 45 void OnRenderedFrame(int width, int height);
46 void OnIncomingPayloadType(int payload_type);
47 void OnIncomingRate(unsigned int framerate, unsigned int bitrate_bps);
48 void OnDecoderTiming(int decode_ms,
49 int max_decode_ms,
50 int current_delay_ms,
51 int target_delay_ms,
52 int jitter_buffer_ms,
53 int min_playout_delay_ms,
54 int render_delay_ms);
47 55
48 // Overrides VCMReceiveStatisticsCallback. 56 // Overrides VCMReceiveStatisticsCallback.
49 void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) override; 57 void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) override;
50 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; 58 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
51 void OnDiscardedPacketsUpdated(int discarded_packets) override; 59 void OnDiscardedPacketsUpdated(int discarded_packets) override;
52 60
53 // Overrides ViEDecoderObserver.
54 void IncomingCodecChanged(const int video_channel,
55 const VideoCodec& video_codec) override {}
56 void IncomingRate(const int video_channel,
57 const unsigned int framerate,
58 const unsigned int bitrate_bps) override;
59 void DecoderTiming(int decode_ms,
60 int max_decode_ms,
61 int current_delay_ms,
62 int target_delay_ms,
63 int jitter_buffer_ms,
64 int min_playout_delay_ms,
65 int render_delay_ms) override;
66
67 // Overrides RtcpStatisticsCallback. 61 // Overrides RtcpStatisticsCallback.
68 void StatisticsUpdated(const webrtc::RtcpStatistics& statistics, 62 void StatisticsUpdated(const webrtc::RtcpStatistics& statistics,
69 uint32_t ssrc) override; 63 uint32_t ssrc) override;
70 void CNameChanged(const char* cname, uint32_t ssrc) override; 64 void CNameChanged(const char* cname, uint32_t ssrc) override;
71 65
72 // Overrides RtcpPacketTypeCounterObserver. 66 // Overrides RtcpPacketTypeCounterObserver.
73 void RtcpPacketTypesCounterUpdated( 67 void RtcpPacketTypesCounterUpdated(
74 uint32_t ssrc, 68 uint32_t ssrc,
75 const RtcpPacketTypeCounter& packet_counter) override; 69 const RtcpPacketTypeCounter& packet_counter) override;
76 // Overrides StreamDataCountersCallback. 70 // Overrides StreamDataCountersCallback.
(...skipping 21 matching lines...) Expand all
98 RateStatistics renders_fps_estimator_ GUARDED_BY(crit_); 92 RateStatistics renders_fps_estimator_ GUARDED_BY(crit_);
99 rtc::RateTracker render_fps_tracker_total_ GUARDED_BY(crit_); 93 rtc::RateTracker render_fps_tracker_total_ GUARDED_BY(crit_);
100 SampleCounter render_width_counter_ GUARDED_BY(crit_); 94 SampleCounter render_width_counter_ GUARDED_BY(crit_);
101 SampleCounter render_height_counter_ GUARDED_BY(crit_); 95 SampleCounter render_height_counter_ GUARDED_BY(crit_);
102 SampleCounter decode_time_counter_ GUARDED_BY(crit_); 96 SampleCounter decode_time_counter_ GUARDED_BY(crit_);
103 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); 97 ReportBlockStats report_block_stats_ GUARDED_BY(crit_);
104 }; 98 };
105 99
106 } // namespace webrtc 100 } // namespace webrtc
107 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ 101 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/video/end_to_end_tests.cc ('k') | webrtc/video/receive_statistics_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698