This CL moves GetAdaptUpTarget(), GetAdaptDownTarget() and ApplyAdaptationTarget() - and related code - to the VideoStreamAdapter. This includes pieces related to calculating how to adapt, including: - DegradationPreference - BalancedDegradationPreference - AdaptationRequest and last_adaptation_request_ - CanAdaptUpResolution() The VideoStreamAdapter's interface has changed: VideoSourceRestrictor methods are now hidden in favor of methods exposing AdaptationTarget. This CL also does some misc moves: - GetEncoderBitrateLimits is moved and renamed to VideoEncoder::EncoderInfo::GetEncoderBitrateLimitsForResolution. - EncoderSettings moved to a separate file. // For api/video_codecs/video_encoder.[cc/h] changes, which is the // moving of a function. TBR=sprang@webrtc.org Bug: webrtc:11393 Change-Id: Ie6bd8ef644ce927d7eca6ab90a0a7bcace682f3c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169842 Reviewed-by: Henrik Boström <hbos@webrtc.org> 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@{#30708}
47 lines
1.6 KiB
C++
47 lines
1.6 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_ENCODER_SETTINGS_H_
|
|
#define CALL_ADAPTATION_ENCODER_SETTINGS_H_
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/video_codecs/video_codec.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_config.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Information about an encoder available when reconfiguring the encoder.
|
|
class EncoderSettings {
|
|
public:
|
|
EncoderSettings(VideoEncoder::EncoderInfo encoder_info,
|
|
VideoEncoderConfig encoder_config,
|
|
VideoCodec video_codec);
|
|
|
|
// Encoder capabilities, implementation info, etc.
|
|
const VideoEncoder::EncoderInfo& encoder_info() const;
|
|
// Configuration parameters, ultimately coming from the API and negotiation.
|
|
const VideoEncoderConfig& encoder_config() const;
|
|
// Lower level config, heavily based on the VideoEncoderConfig.
|
|
const VideoCodec& video_codec() const;
|
|
|
|
private:
|
|
VideoEncoder::EncoderInfo encoder_info_;
|
|
VideoEncoderConfig encoder_config_;
|
|
VideoCodec video_codec_;
|
|
};
|
|
|
|
VideoCodecType GetVideoCodecTypeOrGeneric(
|
|
const absl::optional<EncoderSettings>& settings);
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // CALL_ADAPTATION_ENCODER_SETTINGS_H_
|