mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 00:57:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Adaptation] Remove processing_in_progress_ from ResourceAdaptationProcessor

Browse source 
This flag was used to protect an AdaptationListener from adapting again,
but since AdaptationListener was removed this guard is no longer needed.

Bug: webrtc:11834
Change-Id: If79e960f57aaf56ce2849329ff6737414fc60e9a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181068
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@google.com>
Cr-Commit-Position: refs/heads/master@{#31905}
This commit is contained in:
Evan Shrubsole 2020-08-11 09:14:46 +02:00 committed by Commit Bot
parent 5a37d122d3
commit 64a60835a1
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
call/adaptation/resource_adaptation_processor.cc
View file

@ -78,8 +78,7 @@ ResourceAdaptationProcessor::ResourceAdaptationProcessor(
resources_(), resources_(),
stream_adapter_(stream_adapter), stream_adapter_(stream_adapter),
last_reported_source_restrictions_(), last_reported_source_restrictions_(),
previous_mitigation_results_(), previous_mitigation_results_() {
processing_in_progress_(false) {
RTC_DCHECK(stream_adapter_); RTC_DCHECK(stream_adapter_);
} }
@ -244,12 +243,9 @@ ResourceAdaptationProcessor::MitigationResultAndLogMessage
ResourceAdaptationProcessor::OnResourceUnderuse( ResourceAdaptationProcessor::OnResourceUnderuse(
rtc::scoped_refptr<Resource> reason_resource) { rtc::scoped_refptr<Resource> reason_resource) {
RTC_DCHECK_RUN_ON(resource_adaptation_queue_); RTC_DCHECK_RUN_ON(resource_adaptation_queue_);
RTC_DCHECK(!processing_in_progress_);
processing_in_progress_ = true;
// How can this stream be adapted up? // How can this stream be adapted up?
Adaptation adaptation = stream_adapter_->GetAdaptationUp(reason_resource); Adaptation adaptation = stream_adapter_->GetAdaptationUp(reason_resource);
if (adaptation.status() != Adaptation::Status::kValid) { if (adaptation.status() != Adaptation::Status::kValid) {
processing_in_progress_ = false;
rtc::StringBuilder message; rtc::StringBuilder message;
message << "Not adapting up because VideoStreamAdapter returned " message << "Not adapting up because VideoStreamAdapter returned "
<< Adaptation::StatusToString(adaptation.status()); << Adaptation::StatusToString(adaptation.status());
@ -271,7 +267,6 @@ ResourceAdaptationProcessor::OnResourceUnderuse(
// adaptation. // adaptation.
if (absl::c_find(most_limited_resources, reason_resource) == if (absl::c_find(most_limited_resources, reason_resource) ==
most_limited_resources.end()) { most_limited_resources.end()) {
processing_in_progress_ = false;
rtc::StringBuilder message; rtc::StringBuilder message;
message << "Resource \"" << reason_resource->Name() message << "Resource \"" << reason_resource->Name()
<< "\" was not the most limited resource."; << "\" was not the most limited resource.";
@ -284,7 +279,6 @@ ResourceAdaptationProcessor::OnResourceUnderuse(
// before the adaptation is applied. // before the adaptation is applied.
UpdateResourceLimitations(reason_resource, adaptation.restrictions(), UpdateResourceLimitations(reason_resource, adaptation.restrictions(),
adaptation.counters()); adaptation.counters());
processing_in_progress_ = false;
rtc::StringBuilder message; rtc::StringBuilder message;
message << "Resource \"" << reason_resource->Name() message << "Resource \"" << reason_resource->Name()
<< "\" was not the only most limited resource."; << "\" was not the only most limited resource.";
@ -294,7 +288,6 @@ ResourceAdaptationProcessor::OnResourceUnderuse(
} }
// Apply adaptation. // Apply adaptation.
stream_adapter_->ApplyAdaptation(adaptation, reason_resource); stream_adapter_->ApplyAdaptation(adaptation, reason_resource);
processing_in_progress_ = false;
rtc::StringBuilder message; rtc::StringBuilder message;
message << "Adapted up successfully. Unfiltered adaptations: " message << "Adapted up successfully. Unfiltered adaptations: "
<< stream_adapter_->adaptation_counters().ToString(); << stream_adapter_->adaptation_counters().ToString();
@ -306,15 +299,12 @@ ResourceAdaptationProcessor::MitigationResultAndLogMessage
ResourceAdaptationProcessor::OnResourceOveruse( ResourceAdaptationProcessor::OnResourceOveruse(
rtc::scoped_refptr<Resource> reason_resource) { rtc::scoped_refptr<Resource> reason_resource) {
RTC_DCHECK_RUN_ON(resource_adaptation_queue_); RTC_DCHECK_RUN_ON(resource_adaptation_queue_);
RTC_DCHECK(!processing_in_progress_);
processing_in_progress_ = true;
// How can this stream be adapted up? // How can this stream be adapted up?
Adaptation adaptation = stream_adapter_->GetAdaptationDown(); Adaptation adaptation = stream_adapter_->GetAdaptationDown();
if (adaptation.min_pixel_limit_reached()) { if (adaptation.min_pixel_limit_reached()) {
encoder_stats_observer_->OnMinPixelLimitReached(); encoder_stats_observer_->OnMinPixelLimitReached();
} }
if (adaptation.status() != Adaptation::Status::kValid) { if (adaptation.status() != Adaptation::Status::kValid) {
processing_in_progress_ = false;
rtc::StringBuilder message; rtc::StringBuilder message;
message << "Not adapting down because VideoStreamAdapter returned " message << "Not adapting down because VideoStreamAdapter returned "
<< Adaptation::StatusToString(adaptation.status()); << Adaptation::StatusToString(adaptation.status());
@ -325,7 +315,6 @@ ResourceAdaptationProcessor::OnResourceOveruse(
UpdateResourceLimitations(reason_resource, adaptation.restrictions(), UpdateResourceLimitations(reason_resource, adaptation.restrictions(),
adaptation.counters()); adaptation.counters());
stream_adapter_->ApplyAdaptation(adaptation, reason_resource); stream_adapter_->ApplyAdaptation(adaptation, reason_resource);
processing_in_progress_ = false;
rtc::StringBuilder message; rtc::StringBuilder message;
message << "Adapted down successfully. Unfiltered adaptations: " message << "Adapted down successfully. Unfiltered adaptations: "
<< stream_adapter_->adaptation_counters().ToString(); << stream_adapter_->adaptation_counters().ToString();

12
call/adaptation/resource_adaptation_processor.h
View file

@ -168,18 +168,6 @@ class ResourceAdaptationProcessor : public ResourceAdaptationProcessorInterface,
// successful adaptation. Used to avoid RTC_LOG spam. // successful adaptation. Used to avoid RTC_LOG spam.
std::map<Resource*, MitigationResult> previous_mitigation_results_ std::map<Resource*, MitigationResult> previous_mitigation_results_
RTC_GUARDED_BY(resource_adaptation_queue_); RTC_GUARDED_BY(resource_adaptation_queue_);
// Prevents recursion.
//
// This is used to prevent triggering resource adaptation in the process of
// already handling resouce adaptation, since that could cause the same states
// to be modified in unexpected ways. Example:
//
// Resource::OnResourceUsageStateMeasured() ->
// ResourceAdaptationProcessor::OnResourceOveruse() ->
// Resource::OnAdaptationApplied() ->
// Resource::OnResourceUsageStateMeasured() ->
// ResourceAdaptationProcessor::OnResourceOveruse() // Boom, not allowed.
bool processing_in_progress_ RTC_GUARDED_BY(resource_adaptation_queue_);
}; };
} // namespace webrtc } // namespace webrtc