58e2d262fc
Fixes issues where statistics only was reported for the first stream if configured with simulcast, and in case of RTX the reported statistics was depending on the order of the report blocks. Also fixes issues with multiple report blocks in the SendStatisticsProxy and the RtcpStatisticsCallback. SendStatisticsProxy is now aware of RTX ssrcs, and the RTCPReceiver is calling the RtcpStatisticsCallback with the correct SSRCs, and not only the primary stream SSRC. R=mflodman@webrtc.org, sprang@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20149004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6903 4adac7df-926f-26a2-2b94-8c16560cd09d
131 lines
3.9 KiB
C++
131 lines
3.9 KiB
C++
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/video/send_statistics_proxy.h"
|
|
|
|
#include <map>
|
|
|
|
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
SendStatisticsProxy::SendStatisticsProxy(
|
|
const VideoSendStream::Config& config)
|
|
: config_(config),
|
|
crit_(CriticalSectionWrapper::CreateCriticalSection()) {
|
|
}
|
|
|
|
SendStatisticsProxy::~SendStatisticsProxy() {}
|
|
|
|
void SendStatisticsProxy::OutgoingRate(const int video_channel,
|
|
const unsigned int framerate,
|
|
const unsigned int bitrate) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
stats_.encode_frame_rate = framerate;
|
|
}
|
|
|
|
void SendStatisticsProxy::SuspendChange(int video_channel, bool is_suspended) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
stats_.suspended = is_suspended;
|
|
}
|
|
|
|
void SendStatisticsProxy::CapturedFrameRate(const int capture_id,
|
|
const unsigned char frame_rate) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
stats_.input_frame_rate = frame_rate;
|
|
}
|
|
|
|
VideoSendStream::Stats SendStatisticsProxy::GetStats() const {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
return stats_;
|
|
}
|
|
|
|
StreamStats* SendStatisticsProxy::GetStatsEntry(uint32_t ssrc) {
|
|
std::map<uint32_t, StreamStats>::iterator it = stats_.substreams.find(ssrc);
|
|
if (it != stats_.substreams.end())
|
|
return &it->second;
|
|
|
|
if (std::find(config_.rtp.ssrcs.begin(), config_.rtp.ssrcs.end(), ssrc) ==
|
|
config_.rtp.ssrcs.end() &&
|
|
std::find(config_.rtp.rtx.ssrcs.begin(),
|
|
config_.rtp.rtx.ssrcs.end(),
|
|
ssrc) == config_.rtp.rtx.ssrcs.end()) {
|
|
return NULL;
|
|
}
|
|
|
|
return &stats_.substreams[ssrc]; // Insert new entry and return ptr.
|
|
}
|
|
|
|
void SendStatisticsProxy::StatisticsUpdated(const RtcpStatistics& statistics,
|
|
uint32_t ssrc) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == NULL)
|
|
return;
|
|
|
|
stats->rtcp_stats = statistics;
|
|
}
|
|
|
|
void SendStatisticsProxy::DataCountersUpdated(
|
|
const StreamDataCounters& counters,
|
|
uint32_t ssrc) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == NULL)
|
|
return;
|
|
|
|
stats->rtp_stats = counters;
|
|
}
|
|
|
|
void SendStatisticsProxy::Notify(const BitrateStatistics& bitrate,
|
|
uint32_t ssrc) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == NULL)
|
|
return;
|
|
|
|
stats->bitrate_bps = bitrate.bitrate_bps;
|
|
}
|
|
|
|
void SendStatisticsProxy::FrameCountUpdated(FrameType frame_type,
|
|
uint32_t frame_count,
|
|
const unsigned int ssrc) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == NULL)
|
|
return;
|
|
|
|
switch (frame_type) {
|
|
case kVideoFrameDelta:
|
|
stats->delta_frames = frame_count;
|
|
break;
|
|
case kVideoFrameKey:
|
|
stats->key_frames = frame_count;
|
|
break;
|
|
case kFrameEmpty:
|
|
case kAudioFrameSpeech:
|
|
case kAudioFrameCN:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void SendStatisticsProxy::SendSideDelayUpdated(int avg_delay_ms,
|
|
int max_delay_ms,
|
|
uint32_t ssrc) {
|
|
CriticalSectionScoped lock(crit_.get());
|
|
StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == NULL)
|
|
return;
|
|
stats->avg_delay_ms = avg_delay_ms;
|
|
stats->max_delay_ms = max_delay_ms;
|
|
}
|
|
|
|
} // namespace webrtc
|