ce0ea49001
This is part of the work for making VideoStreamEncoder responsible for configuring its source/sink and limiting the responsibility of OveruseFrameDetectorResourceAdaptationModule to only output relevant VideoSourceRestrictions. BEFORE THIS CL Prior to this CL, OveruseFrameDetector was responsible for performing AddOrUpdateSink() on the source, which it did using its nested class VideoSourceProxy. AddOrUpdateSink() could happen for both adaptation and non-adaptation related reasons. For example: - Adaptation related: AdaptUp() or AdaptDown() happens, causing updated VideoSourceRestrictions. - Non-adaptation related: VideoStreamEncoder asks the module to reconfigure the source/sink for it, such as with SetMaxFramerateAndAlignment() or SetWantsRotationApplied(). AFTER THIS CL AddOrUpdateSink() is performed by VideoSourceController, which is owned by VideoStreamEncoder. Any reconfiguration has to go through the VideoStreamEncoder. This means that: - Non-adaptation related settings happen between VideoStreamEncoder and VideoSourceController directly (without going through the adaptation module). - Adaptation related changes can be expressed in terms of VideoSourceRestrictions. OveruseFrameDetectorResourceAdaptationModule only has to output the restrictions and not know or care about other source/sink settings. For now, VideoSourceController has to know about DegradationPreference. In a future CL, the DegradationPreference logic should move back to the adaptation module. The VideoSourceRestrictions are fully capable of expressing all possible source/sink values without the "modifier" that is the degradation preference. Bug: webrtc:11222 Change-Id: I0f058c4700ca108e2d9f212e38b61f6f728aa419 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162802 Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Cr-Commit-Position: refs/heads/master@{#30228}
60 lines
2.5 KiB
C++
60 lines
2.5 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.
|
|
*/
|
|
|
|
#ifndef CALL_ADAPTATION_RESOURCE_ADAPTATION_MODULE_INTERFACE_H_
|
|
#define CALL_ADAPTATION_RESOURCE_ADAPTATION_MODULE_INTERFACE_H_
|
|
|
|
#include "call/adaptation/video_source_restrictions.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// The listener is responsible for carrying out the reconfiguration of the video
|
|
// source such that the VideoSourceRestrictions are fulfilled.
|
|
class ResourceAdaptationModuleListener {
|
|
public:
|
|
virtual ~ResourceAdaptationModuleListener();
|
|
|
|
// TODO(hbos): When we support the muli-stream use case, the arguments need to
|
|
// specify which video stream's source needs to be reconfigured.
|
|
virtual void OnVideoSourceRestrictionsUpdated(
|
|
VideoSourceRestrictions restrictions) = 0;
|
|
};
|
|
|
|
// Responsible for reconfiguring encoded streams based on resource consumption,
|
|
// such as scaling down resolution or frame rate when CPU is overused. This
|
|
// interface is meant to be injectable into VideoStreamEncoder.
|
|
//
|
|
// [UNDER CONSTRUCTION] This interface is work-in-progress. In the future it
|
|
// needs to be able to handle all the necessary input and output for resource
|
|
// adaptation decision making.
|
|
//
|
|
// TODO(https://crbug.com/webrtc/11222): Make this interface feature-complete so
|
|
// that a module (such as OveruseFrameDetectorResourceAdaptationModule) is fully
|
|
// operational through this abstract interface.
|
|
class ResourceAdaptationModuleInterface {
|
|
public:
|
|
virtual ~ResourceAdaptationModuleInterface();
|
|
|
|
// TODO(hbos): When input/output of the module is adequetly handled by this
|
|
// interface, these methods need to say which stream to start/stop, enabling
|
|
// multi-stream aware implementations of ResourceAdaptationModuleInterface. We
|
|
// don't want to do this before we have the right interfaces (e.g. if we pass
|
|
// in a VideoStreamEncoder here directly then have a dependency on a different
|
|
// build target). For the multi-stream use case we may consider making
|
|
// ResourceAdaptationModuleInterface reference counted.
|
|
virtual void StartCheckForOveruse(
|
|
ResourceAdaptationModuleListener* adaptation_listener) = 0;
|
|
virtual void StopCheckForOveruse() = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // CALL_ADAPTATION_RESOURCE_ADAPTATION_MODULE_INTERFACE_H_
|