Remove dead stats from Video{Sender,Receiver}Info.
These stats are neither filled nor plumbed further and might as well be removed (as proven by how easy they were to remove). BUG= R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/39219004 Cr-Commit-Position: refs/heads/master@{#8430} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8430 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
1d0fa5d352
commit
8ad05b7628
@ -1111,11 +1111,9 @@ TEST_F(StatsCollectorTest, ReportsFromRemoteTrack) {
|
|||||||
// Constructs an ssrc stats update.
|
// Constructs an ssrc stats update.
|
||||||
cricket::VideoReceiverInfo video_receiver_info;
|
cricket::VideoReceiverInfo video_receiver_info;
|
||||||
cricket::VideoMediaInfo stats_read;
|
cricket::VideoMediaInfo stats_read;
|
||||||
const int64 kNumOfPacketsConcealed = 54321;
|
|
||||||
|
|
||||||
// Construct a stats value to read.
|
// Construct a stats value to read.
|
||||||
video_receiver_info.add_ssrc(1234);
|
video_receiver_info.add_ssrc(1234);
|
||||||
video_receiver_info.packets_concealed = kNumOfPacketsConcealed;
|
|
||||||
stats_read.receivers.push_back(video_receiver_info);
|
stats_read.receivers.push_back(video_receiver_info);
|
||||||
|
|
||||||
EXPECT_CALL(session_, video_channel()).WillRepeatedly(Return(&video_channel));
|
EXPECT_CALL(session_, video_channel()).WillRepeatedly(Return(&video_channel));
|
||||||
|
@ -814,8 +814,7 @@ struct VoiceReceiverInfo : public MediaReceiverInfo {
|
|||||||
|
|
||||||
struct VideoSenderInfo : public MediaSenderInfo {
|
struct VideoSenderInfo : public MediaSenderInfo {
|
||||||
VideoSenderInfo()
|
VideoSenderInfo()
|
||||||
: packets_cached(0),
|
: firs_rcvd(0),
|
||||||
firs_rcvd(0),
|
|
||||||
plis_rcvd(0),
|
plis_rcvd(0),
|
||||||
nacks_rcvd(0),
|
nacks_rcvd(0),
|
||||||
input_frame_width(0),
|
input_frame_width(0),
|
||||||
@ -831,11 +830,8 @@ struct VideoSenderInfo : public MediaSenderInfo {
|
|||||||
capture_jitter_ms(0),
|
capture_jitter_ms(0),
|
||||||
avg_encode_ms(0),
|
avg_encode_ms(0),
|
||||||
encode_usage_percent(0),
|
encode_usage_percent(0),
|
||||||
capture_queue_delay_ms_per_s(0) {
|
capture_queue_delay_ms_per_s(0) {}
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<SsrcGroup> ssrc_groups;
|
|
||||||
int packets_cached;
|
|
||||||
int firs_rcvd;
|
int firs_rcvd;
|
||||||
int plis_rcvd;
|
int plis_rcvd;
|
||||||
int nacks_rcvd;
|
int nacks_rcvd;
|
||||||
@ -860,8 +856,7 @@ struct VideoSenderInfo : public MediaSenderInfo {
|
|||||||
|
|
||||||
struct VideoReceiverInfo : public MediaReceiverInfo {
|
struct VideoReceiverInfo : public MediaReceiverInfo {
|
||||||
VideoReceiverInfo()
|
VideoReceiverInfo()
|
||||||
: packets_concealed(0),
|
: firs_sent(0),
|
||||||
firs_sent(0),
|
|
||||||
plis_sent(0),
|
plis_sent(0),
|
||||||
nacks_sent(0),
|
nacks_sent(0),
|
||||||
frame_width(0),
|
frame_width(0),
|
||||||
@ -869,8 +864,6 @@ struct VideoReceiverInfo : public MediaReceiverInfo {
|
|||||||
framerate_rcvd(0),
|
framerate_rcvd(0),
|
||||||
framerate_decoded(0),
|
framerate_decoded(0),
|
||||||
framerate_output(0),
|
framerate_output(0),
|
||||||
framerate_render_input(0),
|
|
||||||
framerate_render_output(0),
|
|
||||||
decode_ms(0),
|
decode_ms(0),
|
||||||
max_decode_ms(0),
|
max_decode_ms(0),
|
||||||
jitter_buffer_ms(0),
|
jitter_buffer_ms(0),
|
||||||
@ -878,11 +871,8 @@ struct VideoReceiverInfo : public MediaReceiverInfo {
|
|||||||
render_delay_ms(0),
|
render_delay_ms(0),
|
||||||
target_delay_ms(0),
|
target_delay_ms(0),
|
||||||
current_delay_ms(0),
|
current_delay_ms(0),
|
||||||
capture_start_ntp_time_ms(-1) {
|
capture_start_ntp_time_ms(-1) {}
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<SsrcGroup> ssrc_groups;
|
|
||||||
int packets_concealed;
|
|
||||||
int firs_sent;
|
int firs_sent;
|
||||||
int plis_sent;
|
int plis_sent;
|
||||||
int nacks_sent;
|
int nacks_sent;
|
||||||
@ -891,10 +881,6 @@ struct VideoReceiverInfo : public MediaReceiverInfo {
|
|||||||
int framerate_rcvd;
|
int framerate_rcvd;
|
||||||
int framerate_decoded;
|
int framerate_decoded;
|
||||||
int framerate_output;
|
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
|
// All stats below are gathered per-VideoReceiver, but some will be correlated
|
||||||
// across MediaStreamTracks. NOTE(hta): when sinking stats into per-SSRC
|
// across MediaStreamTracks. NOTE(hta): when sinking stats into per-SSRC
|
||||||
|
@ -2586,7 +2586,6 @@ bool WebRtcVideoMediaChannel::GetStats(const StatsOptions& options,
|
|||||||
sinfo.codec_name = send_codec_->plName;
|
sinfo.codec_name = send_codec_->plName;
|
||||||
sinfo.bytes_sent = bytes_sent;
|
sinfo.bytes_sent = bytes_sent;
|
||||||
sinfo.packets_sent = packets_sent;
|
sinfo.packets_sent = packets_sent;
|
||||||
sinfo.packets_cached = -1;
|
|
||||||
sinfo.packets_lost = -1;
|
sinfo.packets_lost = -1;
|
||||||
sinfo.fraction_lost = -1;
|
sinfo.fraction_lost = -1;
|
||||||
sinfo.rtt_ms = -1;
|
sinfo.rtt_ms = -1;
|
||||||
@ -2731,7 +2730,6 @@ bool WebRtcVideoMediaChannel::GetStats(const StatsOptions& options,
|
|||||||
rinfo.bytes_rcvd = received.transmitted.payload_bytes;
|
rinfo.bytes_rcvd = received.transmitted.payload_bytes;
|
||||||
rinfo.packets_rcvd = received.transmitted.packets;
|
rinfo.packets_rcvd = received.transmitted.packets;
|
||||||
rinfo.packets_lost = -1;
|
rinfo.packets_lost = -1;
|
||||||
rinfo.packets_concealed = -1;
|
|
||||||
rinfo.fraction_lost = -1; // from SentRTCP
|
rinfo.fraction_lost = -1; // from SentRTCP
|
||||||
rinfo.frame_width = channel->render_adapter()->width();
|
rinfo.frame_width = channel->render_adapter()->width();
|
||||||
rinfo.frame_height = channel->render_adapter()->height();
|
rinfo.frame_height = channel->render_adapter()->height();
|
||||||
|
@ -1785,9 +1785,6 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::GetVideoSenderInfo() {
|
|||||||
info.input_frame_height = last_captured_frame_format.height;
|
info.input_frame_height = last_captured_frame_format.height;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(pbos): Support or remove the following stats.
|
|
||||||
info.packets_cached = -1;
|
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2041,9 +2038,6 @@ WebRtcVideoChannel2::WebRtcVideoReceiveStream::GetVideoReceiverInfo() {
|
|||||||
info.plis_sent = stats.rtcp_packet_type_counts.pli_packets;
|
info.plis_sent = stats.rtcp_packet_type_counts.pli_packets;
|
||||||
info.nacks_sent = stats.rtcp_packet_type_counts.nack_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;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user