dc4f75f7ee
This CL is part of the Call-Level Adaptation Processing design doc: https://docs.google.com/document/d/1ZyC26yOCknrrcYa839ZWLxD6o6Gig5A3lVTh4E41074/edit?usp=sharing The ResourceUsageState was written as: {kOveruse, kStable, kUnderuse}. The assumption was that if a resource neither wanted to adapt up or down it would report kStable. But with the addition of Resource::IsAdaptationUpAllowed() (prior CL) the notion of being "stable" was already captured outside of ResourceUsageState. Furthermore, kStable failed to capture what IsAdaptationUpAllowed() did not: whether we can go up depends on the resulting resolution or frame rate (restrictions_after). Perhaps we can go up a little, but not a lot. This CL also adds Resource::ClearUsageState(). After applying an adaptation, all usage states become invalidated (new measurements are needed to know if we are still over- or underusing). This was always the case, but prior to this CL this was not accurately reflected in the Resource::usage_state() in-between measurements. Bug: webrtc:11172 Change-Id: I140ff3114025b7732e530564690783e168d2509b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173088 Reviewed-by: Evan Shrubsole <eshr@google.com> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31110}
56 lines
1.6 KiB
C++
56 lines
1.6 KiB
C++
/*
|
|
* Copyright 2019 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 "call/adaptation/resource.h"
|
|
|
|
#include "absl/algorithm/container.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
ResourceListener::~ResourceListener() {}
|
|
|
|
Resource::Resource() : usage_state_(absl::nullopt), listener_(nullptr) {}
|
|
|
|
Resource::~Resource() {}
|
|
|
|
void Resource::SetResourceListener(ResourceListener* listener) {
|
|
// If you want to change listener you need to unregister the old listener by
|
|
// setting it to null first.
|
|
RTC_DCHECK(!listener_ || !listener) << "A listener is already set";
|
|
listener_ = listener;
|
|
}
|
|
|
|
absl::optional<ResourceUsageState> Resource::usage_state() const {
|
|
return usage_state_;
|
|
}
|
|
|
|
void Resource::ClearUsageState() {
|
|
usage_state_ = absl::nullopt;
|
|
}
|
|
|
|
bool Resource::IsAdaptationUpAllowed(
|
|
const VideoStreamInputState& input_state,
|
|
const VideoSourceRestrictions& restrictions_before,
|
|
const VideoSourceRestrictions& restrictions_after,
|
|
const Resource& reason_resource) const {
|
|
return true;
|
|
}
|
|
|
|
ResourceListenerResponse Resource::OnResourceUsageStateMeasured(
|
|
ResourceUsageState usage_state) {
|
|
usage_state_ = usage_state;
|
|
if (!listener_)
|
|
return ResourceListenerResponse::kNothing;
|
|
return listener_->OnResourceUsageStateMeasured(*this);
|
|
}
|
|
|
|
} // namespace webrtc
|