381d10963a
This CL unblocks future Call-Level Mitigation strategies by moving the
ResourceAdaptationProcessor to a separate task queue. This signifies a
major milestone in the new resource adaptation architecture because
with this CL the threading model is in place and moving the Processor
to the Call and increasing its responsibilities is made possible.
In this CL, we still have one Processor per VideoStreamEncoder and the
VideoStreamEncoder is responsible for the creation and the destruction
of its Processor and that Processor's task queue. But the PostTasks are
in place and the decision-making is executed on a separate queue.
This CL:
- Moves ResourceAdaptationProcessor to an adaptation task queue.
It continues to be entirely single-threaded, but now operates on a
separate task queue.
- Makes Resources thread-safe: Interaction with the Processor, i.e.
OnResourceUsageStateMeasured() and IsAdaptationUpAllowed(), happens
on the adaptation task queue. State updates are pushed from the
encoder task queue with PostTasks.
- QualityScalerResource operates on both task queues; the QP usage
callbacks are invoked asynchronously.
- The VideoStreamEncoderResourceManager operates on the encoder task
queue with the following exceptions:
1) Its resources are accessible on any thread (using a mutex). This
is OK because resources are reference counted and thread safe.
This aids adding and removing resources to the Processor on the
adaptation task queue.
2) |active_counts_| is moved to the adaptation task queue. This makes
it possible for PreventAdaptUpDueToActiveCounts to run
IsAdaptationUpAllowed() on the adaptation task queue.
A side-effect of this is that some stats reporting now happen on
the adaptation task queue, but that is OK because
VideoStreamEncoderObserver is thread-safe.
The Manager is updated to take the new threading model into account:
- OnFrameDroppedDueToSize() posts to the adaptation task queue to
invoke the Processor.
- OnVideoSourceRestrictionsUpdated(), now invoked on the adaptation
task queue, updates |active_counts_| synchronously but posts to the
encoder task queue to update video source restrictions (which it
only uses to calculate target frame rate).
- MaybePerformQualityRampupExperiment() posts to the adaptation task
queue to maybe reset video source restrictions on the Processor.
|quality_rampup_done_| is made std::atomic.
Bug: webrtc:11542, webrtc:11520
Change-Id: I1cfd76e0cd42f006a6d2527f5aa2aeb5266ba6d6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174441
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@{#31231}
110 lines
3.8 KiB
C++
110 lines
3.8 KiB
C++
/*
|
|
* Copyright 2020 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 "video/adaptation/encode_usage_resource.h"
|
|
|
|
#include <limits>
|
|
#include <utility>
|
|
|
|
#include "api/video/video_adaptation_reason.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
EncodeUsageResource::EncodeUsageResource(
|
|
std::unique_ptr<OveruseFrameDetector> overuse_detector)
|
|
: rtc::RefCountedObject<Resource>(),
|
|
overuse_detector_(std::move(overuse_detector)),
|
|
is_started_(false),
|
|
target_frame_rate_(absl::nullopt) {
|
|
RTC_DCHECK(overuse_detector_);
|
|
}
|
|
|
|
bool EncodeUsageResource::is_started() const {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
return is_started_;
|
|
}
|
|
|
|
void EncodeUsageResource::StartCheckForOveruse(CpuOveruseOptions options) {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
RTC_DCHECK(!is_started_);
|
|
overuse_detector_->StartCheckForOveruse(TaskQueueBase::Current(),
|
|
std::move(options), this);
|
|
is_started_ = true;
|
|
overuse_detector_->OnTargetFramerateUpdated(TargetFrameRateAsInt());
|
|
}
|
|
|
|
void EncodeUsageResource::StopCheckForOveruse() {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
overuse_detector_->StopCheckForOveruse();
|
|
is_started_ = false;
|
|
}
|
|
|
|
void EncodeUsageResource::SetTargetFrameRate(
|
|
absl::optional<double> target_frame_rate) {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
if (target_frame_rate == target_frame_rate_)
|
|
return;
|
|
target_frame_rate_ = target_frame_rate;
|
|
if (is_started_)
|
|
overuse_detector_->OnTargetFramerateUpdated(TargetFrameRateAsInt());
|
|
}
|
|
|
|
void EncodeUsageResource::OnEncodeStarted(const VideoFrame& cropped_frame,
|
|
int64_t time_when_first_seen_us) {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
// TODO(hbos): Rename FrameCaptured() to something more appropriate (e.g.
|
|
// "OnEncodeStarted"?) or revise usage.
|
|
overuse_detector_->FrameCaptured(cropped_frame, time_when_first_seen_us);
|
|
}
|
|
|
|
void EncodeUsageResource::OnEncodeCompleted(
|
|
uint32_t timestamp,
|
|
int64_t time_sent_in_us,
|
|
int64_t capture_time_us,
|
|
absl::optional<int> encode_duration_us) {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
// TODO(hbos): Rename FrameSent() to something more appropriate (e.g.
|
|
// "OnEncodeCompleted"?).
|
|
overuse_detector_->FrameSent(timestamp, time_sent_in_us, capture_time_us,
|
|
encode_duration_us);
|
|
}
|
|
|
|
void EncodeUsageResource::AdaptUp() {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
// Reference counting guarantees that this object is still alive by the time
|
|
// the task is executed.
|
|
resource_adaptation_queue()->PostTask(
|
|
[this_ref = rtc::scoped_refptr<EncodeUsageResource>(this)] {
|
|
RTC_DCHECK_RUN_ON(this_ref->resource_adaptation_queue());
|
|
this_ref->OnResourceUsageStateMeasured(ResourceUsageState::kUnderuse);
|
|
});
|
|
}
|
|
|
|
void EncodeUsageResource::AdaptDown() {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
// Reference counting guarantees that this object is still alive by the time
|
|
// the task is executed.
|
|
resource_adaptation_queue()->PostTask(
|
|
[this_ref = rtc::scoped_refptr<EncodeUsageResource>(this)] {
|
|
RTC_DCHECK_RUN_ON(this_ref->resource_adaptation_queue());
|
|
this_ref->OnResourceUsageStateMeasured(ResourceUsageState::kOveruse);
|
|
});
|
|
}
|
|
|
|
int EncodeUsageResource::TargetFrameRateAsInt() {
|
|
RTC_DCHECK_RUN_ON(encoder_queue());
|
|
return target_frame_rate_.has_value()
|
|
? static_cast<int>(target_frame_rate_.value())
|
|
: std::numeric_limits<int>::max();
|
|
}
|
|
|
|
} // namespace webrtc
|