Wire up statistics in video send stream of new video engine api
Note, this CL does not contain any tests. Those are implemeted as call
tests and will be submitted when the receive stream is wired up as well.
BUG=2235
R=mflodman@webrtc.org, pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/5559006
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5344 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc
index e18b346..0ab7039 100644
--- a/video/video_send_stream.cc
+++ b/video/video_send_stream.cc
@@ -186,9 +186,32 @@
if (config.suspend_below_min_bitrate) {
codec_->SuspendBelowMinBitrate(channel_);
}
+
+ stats_proxy_.reset(
+ new SendStatisticsProxy(config, this));
+
+ rtp_rtcp_->RegisterSendChannelRtcpStatisticsCallback(channel_,
+ stats_proxy_.get());
+ rtp_rtcp_->RegisterSendChannelRtpStatisticsCallback(channel_,
+ stats_proxy_.get());
+ rtp_rtcp_->RegisterSendBitrateObserver(channel_, stats_proxy_.get());
+ rtp_rtcp_->RegisterSendFrameCountObserver(channel_, stats_proxy_.get());
+
+ codec_->RegisterEncoderObserver(channel_, *stats_proxy_);
+ capture_->RegisterObserver(capture_id_, *stats_proxy_);
}
VideoSendStream::~VideoSendStream() {
+ capture_->DeregisterObserver(capture_id_);
+ codec_->DeregisterEncoderObserver(channel_);
+
+ rtp_rtcp_->DeregisterSendFrameCountObserver(channel_, stats_proxy_.get());
+ rtp_rtcp_->DeregisterSendBitrateObserver(channel_, stats_proxy_.get());
+ rtp_rtcp_->DeregisterSendChannelRtpStatisticsCallback(channel_,
+ stats_proxy_.get());
+ rtp_rtcp_->DeregisterSendChannelRtcpStatisticsCallback(channel_,
+ stats_proxy_.get());
+
image_process_->DeRegisterPreEncodeCallback(channel_);
network_->DeregisterSendTransport(channel_);
@@ -293,5 +316,21 @@
return network_->ReceivedRTCPPacket(
channel_, packet, static_cast<int>(length)) == 0;
}
+
+VideoSendStream::Stats VideoSendStream::GetStats() const {
+ return stats_proxy_->GetStats();
+}
+
+bool VideoSendStream::GetSendSideDelay(VideoSendStream::Stats* stats) {
+ return codec_->GetSendSideDelay(
+ channel_, &stats->avg_delay_ms, &stats->max_delay_ms);
+}
+
+std::string VideoSendStream::GetCName() {
+ char rtcp_cname[ViERTP_RTCP::KMaxRTCPCNameLength];
+ rtp_rtcp_->GetRTCPCName(channel_, rtcp_cname);
+ return rtcp_cname;
+}
+
} // namespace internal
} // namespace webrtc