diff --git a/talk/app/webrtc/statscollector_unittest.cc b/talk/app/webrtc/statscollector_unittest.cc index 8a1dc77ba..7ba83add8 100644 --- a/talk/app/webrtc/statscollector_unittest.cc +++ b/talk/app/webrtc/statscollector_unittest.cc @@ -1111,11 +1111,9 @@ TEST_F(StatsCollectorTest, ReportsFromRemoteTrack) { // Constructs an ssrc stats update. cricket::VideoReceiverInfo video_receiver_info; cricket::VideoMediaInfo stats_read; - const int64 kNumOfPacketsConcealed = 54321; // Construct a stats value to read. video_receiver_info.add_ssrc(1234); - video_receiver_info.packets_concealed = kNumOfPacketsConcealed; stats_read.receivers.push_back(video_receiver_info); EXPECT_CALL(session_, video_channel()).WillRepeatedly(Return(&video_channel)); diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h index 19cb9a38d..8ba495029 100644 --- a/talk/media/base/mediachannel.h +++ b/talk/media/base/mediachannel.h @@ -814,8 +814,7 @@ struct VoiceReceiverInfo : public MediaReceiverInfo { struct VideoSenderInfo : public MediaSenderInfo { VideoSenderInfo() - : packets_cached(0), - firs_rcvd(0), + : firs_rcvd(0), plis_rcvd(0), nacks_rcvd(0), input_frame_width(0), @@ -831,11 +830,8 @@ struct VideoSenderInfo : public MediaSenderInfo { capture_jitter_ms(0), avg_encode_ms(0), encode_usage_percent(0), - capture_queue_delay_ms_per_s(0) { - } + capture_queue_delay_ms_per_s(0) {} - std::vector ssrc_groups; - int packets_cached; int firs_rcvd; int plis_rcvd; int nacks_rcvd; @@ -860,8 +856,7 @@ struct VideoSenderInfo : public MediaSenderInfo { struct VideoReceiverInfo : public MediaReceiverInfo { VideoReceiverInfo() - : packets_concealed(0), - firs_sent(0), + : firs_sent(0), plis_sent(0), nacks_sent(0), frame_width(0), @@ -869,8 +864,6 @@ struct VideoReceiverInfo : public MediaReceiverInfo { framerate_rcvd(0), framerate_decoded(0), framerate_output(0), - framerate_render_input(0), - framerate_render_output(0), decode_ms(0), max_decode_ms(0), jitter_buffer_ms(0), @@ -878,11 +871,8 @@ struct VideoReceiverInfo : public MediaReceiverInfo { render_delay_ms(0), target_delay_ms(0), current_delay_ms(0), - capture_start_ntp_time_ms(-1) { - } + capture_start_ntp_time_ms(-1) {} - std::vector ssrc_groups; - int packets_concealed; int firs_sent; int plis_sent; int nacks_sent; @@ -891,10 +881,6 @@ struct VideoReceiverInfo : public MediaReceiverInfo { int framerate_rcvd; int framerate_decoded; int framerate_output; - // Framerate as sent to the renderer. - int framerate_render_input; - // Framerate that the renderer reports. - int framerate_render_output; // All stats below are gathered per-VideoReceiver, but some will be correlated // across MediaStreamTracks. NOTE(hta): when sinking stats into per-SSRC diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index f9508e1cc..62c7bd81f 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -2586,7 +2586,6 @@ bool WebRtcVideoMediaChannel::GetStats(const StatsOptions& options, sinfo.codec_name = send_codec_->plName; sinfo.bytes_sent = bytes_sent; sinfo.packets_sent = packets_sent; - sinfo.packets_cached = -1; sinfo.packets_lost = -1; sinfo.fraction_lost = -1; sinfo.rtt_ms = -1; @@ -2731,7 +2730,6 @@ bool WebRtcVideoMediaChannel::GetStats(const StatsOptions& options, rinfo.bytes_rcvd = received.transmitted.payload_bytes; rinfo.packets_rcvd = received.transmitted.packets; rinfo.packets_lost = -1; - rinfo.packets_concealed = -1; rinfo.fraction_lost = -1; // from SentRTCP rinfo.frame_width = channel->render_adapter()->width(); rinfo.frame_height = channel->render_adapter()->height(); diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 765898685..3bbf1a34d 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -1785,9 +1785,6 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::GetVideoSenderInfo() { info.input_frame_height = last_captured_frame_format.height; } - // TODO(pbos): Support or remove the following stats. - info.packets_cached = -1; - return info; } @@ -2041,9 +2038,6 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetVideoReceiverInfo() { info.plis_sent = stats.rtcp_packet_type_counts.pli_packets; info.nacks_sent = stats.rtcp_packet_type_counts.nack_packets; - // TODO(pbos): Support or remove the following stats. - info.packets_concealed = -1; - return info; }