Since padding is no longer sent on Encoded() callbacks, dummy callbacks aren't required to generate padding. This skip-frame behavior can then be removed to get rid of dummy callbacks though nothing was encoded. As frames don't have to be generated for frames that don't have to be sent we skip encoding frames that aren't intended to be sent either, reducing CPU load. BUG= R=mflodman@webrtc.org, stefan@webrtc.org Review URL: https://codereview.webrtc.org/1369923005 . Cr-Commit-Position: refs/heads/master@{#10181}
308 lines
10 KiB
C++
308 lines
10 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 <algorithm>
|
|
#include <map>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
|
|
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
|
#include "webrtc/system_wrappers/interface/logging.h"
|
|
#include "webrtc/system_wrappers/interface/metrics.h"
|
|
|
|
namespace webrtc {
|
|
|
|
const int SendStatisticsProxy::kStatsTimeoutMs = 5000;
|
|
|
|
SendStatisticsProxy::SendStatisticsProxy(Clock* clock,
|
|
const VideoSendStream::Config& config)
|
|
: clock_(clock),
|
|
config_(config),
|
|
input_frame_rate_tracker_(100u, 10u),
|
|
sent_frame_rate_tracker_(100u, 10u),
|
|
last_sent_frame_timestamp_(0),
|
|
max_sent_width_per_timestamp_(0),
|
|
max_sent_height_per_timestamp_(0) {
|
|
}
|
|
|
|
SendStatisticsProxy::~SendStatisticsProxy() {
|
|
UpdateHistograms();
|
|
}
|
|
|
|
void SendStatisticsProxy::UpdateHistograms() {
|
|
int input_fps =
|
|
static_cast<int>(input_frame_rate_tracker_.ComputeTotalRate());
|
|
if (input_fps > 0)
|
|
RTC_HISTOGRAM_COUNTS_100("WebRTC.Video.InputFramesPerSecond", input_fps);
|
|
int sent_fps =
|
|
static_cast<int>(sent_frame_rate_tracker_.ComputeTotalRate());
|
|
if (sent_fps > 0)
|
|
RTC_HISTOGRAM_COUNTS_100("WebRTC.Video.SentFramesPerSecond", sent_fps);
|
|
|
|
const int kMinRequiredSamples = 200;
|
|
int in_width = input_width_counter_.Avg(kMinRequiredSamples);
|
|
int in_height = input_height_counter_.Avg(kMinRequiredSamples);
|
|
if (in_width != -1) {
|
|
RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.InputWidthInPixels", in_width);
|
|
RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.InputHeightInPixels", in_height);
|
|
}
|
|
int sent_width = sent_width_counter_.Avg(kMinRequiredSamples);
|
|
int sent_height = sent_height_counter_.Avg(kMinRequiredSamples);
|
|
if (sent_width != -1) {
|
|
RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.SentWidthInPixels", sent_width);
|
|
RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.SentHeightInPixels", sent_height);
|
|
}
|
|
int encode_ms = encode_time_counter_.Avg(kMinRequiredSamples);
|
|
if (encode_ms != -1)
|
|
RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.EncodeTimeInMs", encode_ms);
|
|
|
|
int key_frames_permille = key_frame_counter_.Permille(kMinRequiredSamples);
|
|
if (key_frames_permille != -1) {
|
|
RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.KeyFramesSentInPermille",
|
|
key_frames_permille);
|
|
}
|
|
}
|
|
|
|
void SendStatisticsProxy::OnOutgoingRate(uint32_t framerate, uint32_t bitrate) {
|
|
rtc::CritScope lock(&crit_);
|
|
stats_.encode_frame_rate = framerate;
|
|
stats_.media_bitrate_bps = bitrate;
|
|
}
|
|
|
|
void SendStatisticsProxy::CpuOveruseMetricsUpdated(
|
|
const CpuOveruseMetrics& metrics) {
|
|
rtc::CritScope lock(&crit_);
|
|
// TODO(asapersson): Change to use OnEncodedFrame() for avg_encode_time_ms.
|
|
stats_.avg_encode_time_ms = metrics.avg_encode_time_ms;
|
|
stats_.encode_usage_percent = metrics.encode_usage_percent;
|
|
}
|
|
|
|
void SendStatisticsProxy::OnSuspendChange(bool is_suspended) {
|
|
rtc::CritScope lock(&crit_);
|
|
stats_.suspended = is_suspended;
|
|
}
|
|
|
|
VideoSendStream::Stats SendStatisticsProxy::GetStats() {
|
|
rtc::CritScope lock(&crit_);
|
|
PurgeOldStats();
|
|
stats_.input_frame_rate =
|
|
static_cast<int>(input_frame_rate_tracker_.ComputeRate());
|
|
return stats_;
|
|
}
|
|
|
|
void SendStatisticsProxy::PurgeOldStats() {
|
|
int64_t old_stats_ms = clock_->TimeInMilliseconds() - kStatsTimeoutMs;
|
|
for (std::map<uint32_t, VideoSendStream::StreamStats>::iterator it =
|
|
stats_.substreams.begin();
|
|
it != stats_.substreams.end(); ++it) {
|
|
uint32_t ssrc = it->first;
|
|
if (update_times_[ssrc].resolution_update_ms <= old_stats_ms) {
|
|
it->second.width = 0;
|
|
it->second.height = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
VideoSendStream::StreamStats* SendStatisticsProxy::GetStatsEntry(
|
|
uint32_t ssrc) {
|
|
std::map<uint32_t, VideoSendStream::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 nullptr;
|
|
}
|
|
|
|
return &stats_.substreams[ssrc]; // Insert new entry and return ptr.
|
|
}
|
|
|
|
void SendStatisticsProxy::OnInactiveSsrc(uint32_t ssrc) {
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == nullptr)
|
|
return;
|
|
|
|
stats->total_bitrate_bps = 0;
|
|
stats->retransmit_bitrate_bps = 0;
|
|
stats->height = 0;
|
|
stats->width = 0;
|
|
}
|
|
|
|
void SendStatisticsProxy::OnSetRates(uint32_t bitrate_bps, int framerate) {
|
|
rtc::CritScope lock(&crit_);
|
|
stats_.target_media_bitrate_bps = bitrate_bps;
|
|
}
|
|
|
|
void SendStatisticsProxy::OnSendEncodedImage(
|
|
const EncodedImage& encoded_image,
|
|
const RTPVideoHeader* rtp_video_header) {
|
|
size_t simulcast_idx =
|
|
rtp_video_header != nullptr ? rtp_video_header->simulcastIdx : 0;
|
|
if (simulcast_idx >= config_.rtp.ssrcs.size()) {
|
|
LOG(LS_ERROR) << "Encoded image outside simulcast range (" << simulcast_idx
|
|
<< " >= " << config_.rtp.ssrcs.size() << ").";
|
|
return;
|
|
}
|
|
uint32_t ssrc = config_.rtp.ssrcs[simulcast_idx];
|
|
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == nullptr)
|
|
return;
|
|
|
|
stats->width = encoded_image._encodedWidth;
|
|
stats->height = encoded_image._encodedHeight;
|
|
update_times_[ssrc].resolution_update_ms = clock_->TimeInMilliseconds();
|
|
|
|
key_frame_counter_.Add(encoded_image._frameType == kKeyFrame);
|
|
|
|
// TODO(asapersson): This is incorrect if simulcast layers are encoded on
|
|
// different threads and there is no guarantee that one frame of all layers
|
|
// are encoded before the next start.
|
|
if (last_sent_frame_timestamp_ > 0 &&
|
|
encoded_image._timeStamp != last_sent_frame_timestamp_) {
|
|
sent_frame_rate_tracker_.AddSamples(1);
|
|
sent_width_counter_.Add(max_sent_width_per_timestamp_);
|
|
sent_height_counter_.Add(max_sent_height_per_timestamp_);
|
|
max_sent_width_per_timestamp_ = 0;
|
|
max_sent_height_per_timestamp_ = 0;
|
|
}
|
|
last_sent_frame_timestamp_ = encoded_image._timeStamp;
|
|
max_sent_width_per_timestamp_ =
|
|
std::max(max_sent_width_per_timestamp_,
|
|
static_cast<int>(encoded_image._encodedWidth));
|
|
max_sent_height_per_timestamp_ =
|
|
std::max(max_sent_height_per_timestamp_,
|
|
static_cast<int>(encoded_image._encodedHeight));
|
|
}
|
|
|
|
void SendStatisticsProxy::OnIncomingFrame(int width, int height) {
|
|
rtc::CritScope lock(&crit_);
|
|
input_frame_rate_tracker_.AddSamples(1);
|
|
input_width_counter_.Add(width);
|
|
input_height_counter_.Add(height);
|
|
}
|
|
|
|
void SendStatisticsProxy::OnEncodedFrame(int encode_time_ms) {
|
|
rtc::CritScope lock(&crit_);
|
|
encode_time_counter_.Add(encode_time_ms);
|
|
}
|
|
|
|
void SendStatisticsProxy::RtcpPacketTypesCounterUpdated(
|
|
uint32_t ssrc,
|
|
const RtcpPacketTypeCounter& packet_counter) {
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == nullptr)
|
|
return;
|
|
|
|
stats->rtcp_packet_type_counts = packet_counter;
|
|
}
|
|
|
|
void SendStatisticsProxy::StatisticsUpdated(const RtcpStatistics& statistics,
|
|
uint32_t ssrc) {
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == nullptr)
|
|
return;
|
|
|
|
stats->rtcp_stats = statistics;
|
|
}
|
|
|
|
void SendStatisticsProxy::CNameChanged(const char* cname, uint32_t ssrc) {
|
|
}
|
|
|
|
void SendStatisticsProxy::DataCountersUpdated(
|
|
const StreamDataCounters& counters,
|
|
uint32_t ssrc) {
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
RTC_DCHECK(stats != nullptr)
|
|
<< "DataCountersUpdated reported for unknown ssrc: " << ssrc;
|
|
|
|
stats->rtp_stats = counters;
|
|
}
|
|
|
|
void SendStatisticsProxy::Notify(const BitrateStatistics& total_stats,
|
|
const BitrateStatistics& retransmit_stats,
|
|
uint32_t ssrc) {
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == nullptr)
|
|
return;
|
|
|
|
stats->total_bitrate_bps = total_stats.bitrate_bps;
|
|
stats->retransmit_bitrate_bps = retransmit_stats.bitrate_bps;
|
|
}
|
|
|
|
void SendStatisticsProxy::FrameCountUpdated(const FrameCounts& frame_counts,
|
|
uint32_t ssrc) {
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == nullptr)
|
|
return;
|
|
|
|
stats->frame_counts = frame_counts;
|
|
}
|
|
|
|
void SendStatisticsProxy::SendSideDelayUpdated(int avg_delay_ms,
|
|
int max_delay_ms,
|
|
uint32_t ssrc) {
|
|
rtc::CritScope lock(&crit_);
|
|
VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
|
|
if (stats == nullptr)
|
|
return;
|
|
stats->avg_delay_ms = avg_delay_ms;
|
|
stats->max_delay_ms = max_delay_ms;
|
|
}
|
|
|
|
void SendStatisticsProxy::SampleCounter::Add(int sample) {
|
|
sum += sample;
|
|
++num_samples;
|
|
}
|
|
|
|
int SendStatisticsProxy::SampleCounter::Avg(int min_required_samples) const {
|
|
if (num_samples < min_required_samples || num_samples == 0)
|
|
return -1;
|
|
return sum / num_samples;
|
|
}
|
|
|
|
void SendStatisticsProxy::BoolSampleCounter::Add(bool sample) {
|
|
if (sample)
|
|
++sum;
|
|
++num_samples;
|
|
}
|
|
|
|
int SendStatisticsProxy::BoolSampleCounter::Percent(
|
|
int min_required_samples) const {
|
|
return Fraction(min_required_samples, 100.0f);
|
|
}
|
|
|
|
int SendStatisticsProxy::BoolSampleCounter::Permille(
|
|
int min_required_samples) const {
|
|
return Fraction(min_required_samples, 1000.0f);
|
|
}
|
|
|
|
int SendStatisticsProxy::BoolSampleCounter::Fraction(
|
|
int min_required_samples, float multiplier) const {
|
|
if (num_samples < min_required_samples || num_samples == 0)
|
|
return -1;
|
|
return static_cast<int>((sum * multiplier / num_samples) + 0.5f);
|
|
}
|
|
|
|
} // namespace webrtc
|