zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DVQA] Enforce state checks before any API calls

Browse Source 
Bug: b/199244618
Change-Id: I356cc95688f9a46b943e51585583927b01d8cd0f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231461
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34948}
This commit is contained in:
Artem Titov
2021-09-08 12:10:44 +02:00
committed by WebRTC LUCI CQ
parent 7d0203c723
commit 034abc9581
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc
View File

@ -143,6 +143,8 @@ void DefaultVideoQualityAnalyzer::Start(
peers_ = std::make_unique<NamesCollection>(peer_names); peers_ = std::make_unique<NamesCollection>(peer_names);
RTC_CHECK(start_time_.IsMinusInfinity()); RTC_CHECK(start_time_.IsMinusInfinity());
RTC_CHECK_EQ(state_, State::kNew)
<< "DefaultVideoQualityAnalyzer is already started";
state_ = State::kActive; state_ = State::kActive;
start_time_ = Now(); start_time_ = Now();
} }
@ -161,6 +163,8 @@ uint16_t DefaultVideoQualityAnalyzer::OnFrameCaptured(
size_t stream_index; size_t stream_index;
{ {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
RTC_CHECK_EQ(state_, State::kActive)
<< "DefaultVideoQualityAnalyzer has to be started before use";
// Create a local copy of `start_time_`, peer's index and total peers count // Create a local copy of `start_time_`, peer's index and total peers count
// to access it without holding a `mutex_` during access to // to access it without holding a `mutex_` during access to
// `frames_comparator_`. // `frames_comparator_`.
@ -256,6 +260,9 @@ void DefaultVideoQualityAnalyzer::OnFramePreEncode(
absl::string_view peer_name, absl::string_view peer_name,
const webrtc::VideoFrame& frame) { const webrtc::VideoFrame& frame) {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
RTC_CHECK_EQ(state_, State::kActive)
<< "DefaultVideoQualityAnalyzer has to be started before use";
auto it = captured_frames_in_flight_.find(frame.id()); auto it = captured_frames_in_flight_.find(frame.id());
RTC_DCHECK(it != captured_frames_in_flight_.end()) RTC_DCHECK(it != captured_frames_in_flight_.end())
<< "Frame id=" << frame.id() << " not found"; << "Frame id=" << frame.id() << " not found";
@ -276,6 +283,9 @@ void DefaultVideoQualityAnalyzer::OnFrameEncoded(
const webrtc::EncodedImage& encoded_image, const webrtc::EncodedImage& encoded_image,
const EncoderStats& stats) { const EncoderStats& stats) {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
RTC_CHECK_EQ(state_, State::kActive)
<< "DefaultVideoQualityAnalyzer has to be started before use";
auto it = captured_frames_in_flight_.find(frame_id); auto it = captured_frames_in_flight_.find(frame_id);
if (it == captured_frames_in_flight_.end()) { if (it == captured_frames_in_flight_.end()) {
RTC_LOG(WARNING) RTC_LOG(WARNING)
@ -321,6 +331,9 @@ void DefaultVideoQualityAnalyzer::OnFramePreDecode(
uint16_t frame_id, uint16_t frame_id,
const webrtc::EncodedImage& input_image) { const webrtc::EncodedImage& input_image) {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
RTC_CHECK_EQ(state_, State::kActive)
<< "DefaultVideoQualityAnalyzer has to be started before use";
size_t peer_index = peers_->index(peer_name); size_t peer_index = peers_->index(peer_name);
auto it = captured_frames_in_flight_.find(frame_id); auto it = captured_frames_in_flight_.find(frame_id);
@ -357,6 +370,9 @@ void DefaultVideoQualityAnalyzer::OnFrameDecoded(
const webrtc::VideoFrame& frame, const webrtc::VideoFrame& frame,
const DecoderStats& stats) { const DecoderStats& stats) {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
RTC_CHECK_EQ(state_, State::kActive)
<< "DefaultVideoQualityAnalyzer has to be started before use";
size_t peer_index = peers_->index(peer_name); size_t peer_index = peers_->index(peer_name);
auto it = captured_frames_in_flight_.find(frame.id()); auto it = captured_frames_in_flight_.find(frame.id());
@ -387,6 +403,9 @@ void DefaultVideoQualityAnalyzer::OnFrameRendered(
absl::string_view peer_name, absl::string_view peer_name,
const webrtc::VideoFrame& frame) { const webrtc::VideoFrame& frame) {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
RTC_CHECK_EQ(state_, State::kActive)
<< "DefaultVideoQualityAnalyzer has to be started before use";
size_t peer_index = peers_->index(peer_name); size_t peer_index = peers_->index(peer_name);
auto frame_it = captured_frames_in_flight_.find(frame.id()); auto frame_it = captured_frames_in_flight_.find(frame.id());
@ -559,6 +578,9 @@ void DefaultVideoQualityAnalyzer::Stop() {
if (state_ == State::kStopped) { if (state_ == State::kStopped) {
return; return;
} }
RTC_CHECK_EQ(state_, State::kActive)
<< "DefaultVideoQualityAnalyzer has to be started before use";
state_ = State::kStopped; state_ = State::kStopped;
// Add the amount of frames in flight to the analyzer stats before all left // Add the amount of frames in flight to the analyzer stats before all left