| Index: webrtc/video/receive_statistics_proxy.h
|
| diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h
|
| index 50422109aa5fb96578d3e1846c28c04aaa512106..3041d315ed3d8dba80ddc589e93cc3bb5c245b68 100644
|
| --- a/webrtc/video/receive_statistics_proxy.h
|
| +++ b/webrtc/video/receive_statistics_proxy.h
|
| @@ -31,8 +31,7 @@ class Clock;
|
| class ViECodec;
|
| class ViEDecoderObserver;
|
|
|
| -class ReceiveStatisticsProxy : public ViEDecoderObserver,
|
| - public VCMReceiveStatisticsCallback,
|
| +class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
|
| public RtcpStatisticsCallback,
|
| public RtcpPacketTypeCounterObserver,
|
| public StreamDataCountersCallback {
|
| @@ -44,26 +43,21 @@ class ReceiveStatisticsProxy : public ViEDecoderObserver,
|
|
|
| void OnDecodedFrame();
|
| void OnRenderedFrame(int width, int height);
|
| + void OnIncomingPayloadType(int payload_type);
|
| + void OnIncomingRate(unsigned int framerate, unsigned int bitrate_bps);
|
| + void OnDecoderTiming(int decode_ms,
|
| + int max_decode_ms,
|
| + int current_delay_ms,
|
| + int target_delay_ms,
|
| + int jitter_buffer_ms,
|
| + int min_playout_delay_ms,
|
| + int render_delay_ms);
|
|
|
| // Overrides VCMReceiveStatisticsCallback.
|
| void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) override;
|
| void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
|
| void OnDiscardedPacketsUpdated(int discarded_packets) override;
|
|
|
| - // Overrides ViEDecoderObserver.
|
| - void IncomingCodecChanged(const int video_channel,
|
| - const VideoCodec& video_codec) override {}
|
| - void IncomingRate(const int video_channel,
|
| - const unsigned int framerate,
|
| - const unsigned int bitrate_bps) override;
|
| - void DecoderTiming(int decode_ms,
|
| - int max_decode_ms,
|
| - int current_delay_ms,
|
| - int target_delay_ms,
|
| - int jitter_buffer_ms,
|
| - int min_playout_delay_ms,
|
| - int render_delay_ms) override;
|
| -
|
| // Overrides RtcpStatisticsCallback.
|
| void StatisticsUpdated(const webrtc::RtcpStatistics& statistics,
|
| uint32_t ssrc) override;
|
|
|