012aa375b1
This CL breaks up the CheckQp() operation into several steps managed by the inner helper class CheckQpTask, making responding to high or low QP an asynchronous operation. Why? Reconfiguring the stream in response to QP overuse will in the future be handled on a separate task queue. See Call-Level Adaptation Processing for more details: https://docs.google.com/document/d/1ZyC26yOCknrrcYa839ZWLxD6o6Gig5A3lVTh4E41074/edit?usp=sharing Instead of "bool AdaptDown()" when high QP is reported, synchronously returning true or false depending on the result of adaptation, this CL introduces void QualityScalerQpUsageHandlerInterface::OnReportQpUsageHigh( rtc::scoped_refptr<QualityScalerQpUsageHandlerCallback>); Where QualityScalerQpUsageHandlerCallback::OnQpUsageHandled( bool clear_qp_samples); Instructs the QualityScaler whether to clear samples before checking QP the next time or to increase the frequency of checking (corresponding to AdaptDown's return value prior to this CL). QualityScaler no longer using AdaptationObserverInterface, this class is renamed and moved to overuse_frame_detector.h. The dependency between CheckQpTasks is made explicit with CheckQpTask::Result and variables like observed_enough_frames_, adapt_called_ and adapt_failed_ are moved there and given more descriptive names. Bug: webrtc:11521 Change-Id: I7faf795aeee5ded18ce75eb1617f88226e337228 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173760 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@{#31140}
65 lines
2.2 KiB
C++
65 lines
2.2 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.
|
|
*/
|
|
|
|
#ifndef VIDEO_ADAPTATION_ENCODE_USAGE_RESOURCE_H_
|
|
#define VIDEO_ADAPTATION_ENCODE_USAGE_RESOURCE_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/video/video_adaptation_reason.h"
|
|
#include "call/adaptation/resource.h"
|
|
#include "video/adaptation/overuse_frame_detector.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Handles interaction with the OveruseDetector.
|
|
// TODO(hbos): Add unittests specific to this class, it is currently only tested
|
|
// indirectly by usage in the ResourceAdaptationProcessor (which is only tested
|
|
// because of its usage in VideoStreamEncoder); all tests are currently in
|
|
// video_stream_encoder_unittest.cc.
|
|
class EncodeUsageResource : public Resource,
|
|
public OveruseFrameDetectorObserverInterface {
|
|
public:
|
|
explicit EncodeUsageResource(
|
|
std::unique_ptr<OveruseFrameDetector> overuse_detector);
|
|
|
|
bool is_started() const { return is_started_; }
|
|
|
|
void StartCheckForOveruse(CpuOveruseOptions options);
|
|
void StopCheckForOveruse();
|
|
|
|
void SetTargetFrameRate(absl::optional<double> target_frame_rate);
|
|
void OnEncodeStarted(const VideoFrame& cropped_frame,
|
|
int64_t time_when_first_seen_us);
|
|
void OnEncodeCompleted(uint32_t timestamp,
|
|
int64_t time_sent_in_us,
|
|
int64_t capture_time_us,
|
|
absl::optional<int> encode_duration_us);
|
|
|
|
// OveruseFrameDetectorObserverInterface implementation.
|
|
void AdaptUp() override;
|
|
void AdaptDown() override;
|
|
|
|
std::string name() const override { return "EncoderUsageResource"; }
|
|
|
|
private:
|
|
int TargetFrameRateAsInt();
|
|
|
|
const std::unique_ptr<OveruseFrameDetector> overuse_detector_;
|
|
bool is_started_;
|
|
absl::optional<double> target_frame_rate_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // VIDEO_ADAPTATION_ENCODE_USAGE_RESOURCE_H_
|