generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert r8430 "Remove dead stats from Video{Sender,Receiver}Info."

Browse Source 
This breaks compilation outside this codebase that needs to have it
removed before.

BUG=4322
TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42009004

Cr-Commit-Position: refs/heads/master@{#8432}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8432 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2015-02-19 13:57:03 +00:00
parent 287755246a
commit 1ed6224eaf
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/app/webrtc/statscollector_unittest.cc
View File

@ -1111,9 +1111,11 @@ 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));

22
talk/media/base/mediachannel.h
View File

@ -814,7 +814,8 @@ struct VoiceReceiverInfo : public MediaReceiverInfo {
struct VideoSenderInfo : public MediaSenderInfo {
VideoSenderInfo()
: firs_rcvd(0),
: packets_cached(0),
firs_rcvd(0),
plis_rcvd(0),
nacks_rcvd(0),
input_frame_width(0),
@ -830,8 +831,11 @@ 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<SsrcGroup> ssrc_groups;
int packets_cached;
int firs_rcvd;
int plis_rcvd;
int nacks_rcvd;
@ -856,7 +860,8 @@ struct VideoSenderInfo : public MediaSenderInfo {
struct VideoReceiverInfo : public MediaReceiverInfo {
VideoReceiverInfo()
: firs_sent(0),
: packets_concealed(0),
firs_sent(0),
plis_sent(0),
nacks_sent(0),
frame_width(0),
@ -864,6 +869,8 @@ 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),
@ -871,8 +878,11 @@ 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<SsrcGroup> ssrc_groups;
int packets_concealed;
int firs_sent;
int plis_sent;
int nacks_sent;
@ -881,6 +891,10 @@ 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

2
talk/media/webrtc/webrtcvideoengine.cc
View File

@ -2586,6 +2586,7 @@ 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;
@ -2730,6 +2731,7 @@ 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();

6
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -1785,6 +1785,9 @@ 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;
}
@ -2038,6 +2041,9 @@ 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;
}