20f3f942a0
Prevents bug where transmitted bitrate was reported as higher than what was actually sent, since unused RTP modules weren't updated to say that they sent zero. BUG= R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/49979004 Cr-Commit-Position: refs/heads/master@{#9192}
112 lines
4.1 KiB
C++
112 lines
4.1 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_
|
|
#define WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_
|
|
|
|
#include <string>
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/ratetracker.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/base/thread_annotations.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
|
|
#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
|
|
#include "webrtc/system_wrappers/interface/clock.h"
|
|
#include "webrtc/video_engine/overuse_frame_detector.h"
|
|
#include "webrtc/video_engine/vie_encoder.h"
|
|
#include "webrtc/video_send_stream.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class SendStatisticsProxy : public CpuOveruseMetricsObserver,
|
|
public RtcpStatisticsCallback,
|
|
public RtcpPacketTypeCounterObserver,
|
|
public StreamDataCountersCallback,
|
|
public BitrateStatisticsObserver,
|
|
public FrameCountObserver,
|
|
public ViEEncoderObserver,
|
|
public VideoEncoderRateObserver,
|
|
public SendSideDelayObserver {
|
|
public:
|
|
static const int kStatsTimeoutMs;
|
|
|
|
SendStatisticsProxy(Clock* clock, const VideoSendStream::Config& config);
|
|
virtual ~SendStatisticsProxy();
|
|
|
|
VideoSendStream::Stats GetStats();
|
|
|
|
virtual void OnSendEncodedImage(const EncodedImage& encoded_image,
|
|
const RTPVideoHeader* rtp_video_header);
|
|
// Used to update incoming frame rate.
|
|
void OnIncomingFrame();
|
|
|
|
// From VideoEncoderRateObserver.
|
|
void OnSetRates(uint32_t bitrate_bps, int framerate) override;
|
|
|
|
void OnInactiveSsrc(uint32_t ssrc);
|
|
|
|
protected:
|
|
// From CpuOveruseMetricsObserver.
|
|
void CpuOveruseMetricsUpdated(const CpuOveruseMetrics& metrics) override;
|
|
// From RtcpStatisticsCallback.
|
|
void StatisticsUpdated(const RtcpStatistics& statistics,
|
|
uint32_t ssrc) override;
|
|
void CNameChanged(const char* cname, uint32_t ssrc) override;
|
|
// From RtcpPacketTypeCounterObserver
|
|
void RtcpPacketTypesCounterUpdated(
|
|
uint32_t ssrc,
|
|
const RtcpPacketTypeCounter& packet_counter) override;
|
|
// From StreamDataCountersCallback.
|
|
void DataCountersUpdated(const StreamDataCounters& counters,
|
|
uint32_t ssrc) override;
|
|
|
|
// From BitrateStatisticsObserver.
|
|
void Notify(const BitrateStatistics& total_stats,
|
|
const BitrateStatistics& retransmit_stats,
|
|
uint32_t ssrc) override;
|
|
|
|
// From FrameCountObserver.
|
|
void FrameCountUpdated(const FrameCounts& frame_counts,
|
|
uint32_t ssrc) override;
|
|
|
|
// From ViEEncoderObserver.
|
|
void OutgoingRate(const int video_channel,
|
|
const unsigned int framerate,
|
|
const unsigned int bitrate) override;
|
|
|
|
void SuspendChange(int video_channel, bool is_suspended) override;
|
|
|
|
void SendSideDelayUpdated(int avg_delay_ms,
|
|
int max_delay_ms,
|
|
uint32_t ssrc) override;
|
|
|
|
private:
|
|
struct StatsUpdateTimes {
|
|
StatsUpdateTimes() : resolution_update_ms(0) {}
|
|
int64_t resolution_update_ms;
|
|
int64_t bitrate_update_ms;
|
|
};
|
|
void PurgeOldStats() EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
VideoSendStream::StreamStats* GetStatsEntry(uint32_t ssrc)
|
|
EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
|
Clock* const clock_;
|
|
const VideoSendStream::Config config_;
|
|
mutable rtc::CriticalSection crit_;
|
|
VideoSendStream::Stats stats_ GUARDED_BY(crit_);
|
|
rtc::RateTracker input_frame_rate_tracker_ GUARDED_BY(crit_);
|
|
std::map<uint32_t, StatsUpdateTimes> update_times_ GUARDED_BY(crit_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_
|