d516b25852
This CL is part of the Call-Level Adaptation Processing design doc: https://docs.google.com/document/d/1ZyC26yOCknrrcYa839ZWLxD6o6Gig5A3lVTh4E41074/edit?usp=sharing The "input state" of a VideoStream, needed for adaptation and decision-making, are: source resolution and frame rate, codec type and min pixels per frame (based on encoder scaling settings). These values are modified on the encoder queue of the VideoStreamEncoder. But in order to unblock call-level adaptation processing, where adaptation and decision making happens off the encoder queue, a snapshot of the input states need to be available at point of processing: introducing the VideoStreamInputState. In this CL, the VideoStreamInputStateProvider is added to provide input state snapshots across threads based on input from VideoStreamEncoder and VideoStreamEncoderObserver. The input state's HasInputFrameSizeAndFramesPerSecond() can now be DCHECKed inside the VideoStreamAdapter in favor of having less Adaptation::Status codes. Whether input is "sufficient" for adaptation is now the responsibility of the Processor. (Goal: adapter is purely a Adaptation generator and apply-er.) Somewhat tangental, this CL also deletes VideoStreamEncoder-specific methods from ResourceAdaptationProcessorInterface making them an implementation detail of ResourceAdaptationProcessor. In a future CL, the "processor" will be split up into a "processor" part and a "video stream encoder resource manager" part - more on that later. Bug: webrtc:11172 Change-Id: Id9b158f569db0140b75360aaf0f7e2e28fb924f4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/172928 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@{#31098}
50 lines
1.5 KiB
C++
50 lines
1.5 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 CALL_ADAPTATION_VIDEO_STREAM_INPUT_STATE_H_
|
|
#define CALL_ADAPTATION_VIDEO_STREAM_INPUT_STATE_H_
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/video/video_codec_type.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// The source resolution, frame rate and other properties of a
|
|
// VideoStreamEncoder.
|
|
class VideoStreamInputState {
|
|
public:
|
|
VideoStreamInputState();
|
|
|
|
void set_has_input(bool has_input);
|
|
void set_frame_size_pixels(absl::optional<int> frame_size_pixels);
|
|
void set_frames_per_second(absl::optional<int> frames_per_second);
|
|
void set_video_codec_type(VideoCodecType video_codec_type);
|
|
void set_min_pixels_per_frame(int min_pixels_per_frame);
|
|
|
|
bool has_input() const;
|
|
absl::optional<int> frame_size_pixels() const;
|
|
absl::optional<int> frames_per_second() const;
|
|
VideoCodecType video_codec_type() const;
|
|
int min_pixels_per_frame() const;
|
|
|
|
bool HasInputFrameSizeAndFramesPerSecond() const;
|
|
|
|
private:
|
|
bool has_input_;
|
|
absl::optional<int> frame_size_pixels_;
|
|
absl::optional<int> frames_per_second_;
|
|
VideoCodecType video_codec_type_;
|
|
int min_pixels_per_frame_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // CALL_ADAPTATION_VIDEO_STREAM_INPUT_STATE_H_
|