6811b6e308
Issue https://webrtc-codereview.appspot.com/4459004/ was commited as r5259, after which flakiness was detected and a rollback was performed at r5261. Patch Set 1 of this issue is the code submitted in r5259. Subsequent patch sets fixes a race condition which caused the seen problems. The root cause was a dead lock between a thread sending rtp packets and and a timed module processing thread: webrtc::RTPSender::BitrateUpdated() // Get RTPSender stats lock webrtc::Bitrate::Process() // Get Bitrate lock webrtc::RTPSender::ProcessBitrate() webrtc::ModuleRtpRtcpImpl::Process() ... webrtc::Bitrate::Update() // Get Bitrate lock webrtc::RTPSender::UpdateRtpStats() // Get RTPSender stats lock webrtc::RTPSender::SendToNetwork() ... This is fixed in Bitrate::Process() by releasing the lock before calling the callback. BUG=2235 R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/5619004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5281 4adac7df-926f-26a2-2b94-8c16560cd09d
79 lines
1.9 KiB
C++
79 lines
1.9 KiB
C++
/*
|
|
* Copyright (c) 2012 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_MODULES_RTP_RTCP_SOURCE_BITRATE_H_
|
|
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_BITRATE_H_
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <list>
|
|
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
|
|
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
class CriticalSectionWrapper;
|
|
|
|
class Bitrate {
|
|
public:
|
|
class Observer;
|
|
Bitrate(Clock* clock, Observer* observer);
|
|
virtual ~Bitrate();
|
|
|
|
// Calculates rates.
|
|
void Process();
|
|
|
|
// Update with a packet.
|
|
void Update(const int32_t bytes);
|
|
|
|
// Packet rate last second, updated roughly every 100 ms.
|
|
uint32_t PacketRate() const;
|
|
|
|
// Bitrate last second, updated roughly every 100 ms.
|
|
uint32_t BitrateLast() const;
|
|
|
|
// Bitrate last second, updated now.
|
|
uint32_t BitrateNow() const;
|
|
|
|
int64_t time_last_rate_update() const;
|
|
|
|
class Observer {
|
|
public:
|
|
Observer() {}
|
|
virtual ~Observer() {}
|
|
|
|
virtual void BitrateUpdated(const BitrateStatistics& stats) = 0;
|
|
};
|
|
|
|
protected:
|
|
Clock* clock_;
|
|
|
|
private:
|
|
scoped_ptr<CriticalSectionWrapper> crit_;
|
|
uint32_t packet_rate_;
|
|
uint32_t bitrate_;
|
|
uint8_t bitrate_next_idx_;
|
|
int64_t packet_rate_array_[10];
|
|
int64_t bitrate_array_[10];
|
|
int64_t bitrate_diff_ms_[10];
|
|
int64_t time_last_rate_update_;
|
|
uint32_t bytes_count_;
|
|
uint32_t packet_count_;
|
|
Observer* const observer_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_BITRATE_H_
|