4bab2fcf6b
This squashes together several input signals that were spread out through several calls into a single method and calling place: SetEncoderSettings(), invoked from ReconfigureEncoder(). This is added to the abstract interface. This makes the following methods obsolete which are removed: - SetEncoder(): The VideoEncoder was only used for GetEncoderInfo(); the VideoEncoder::EncoderInfo is now part of the EncoderSettings. - SetEncoderConfig(): The VideoEncoderConfig is part of EncoderSettings. The config is used for its codec_type and content_type enums. - SetCodecMaxFrameRate(): The max frame rate was the same as VideoCodec::maxFramerate. VideoCodec is now part of EncoderSettings. There may be some overlap in information between EncoderConfig and VideoCodec, but that is outside the scope of this CL, which only makes sure to bundle encoder settings-like information into one input signal. Bug: webrtc:11222 Change-Id: I67c49c49c0a859cb7d5051939a461593c695a789 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166602 Reviewed-by: Erik Språng <sprang@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@{#30332}
41 lines
1.3 KiB
C++
41 lines
1.3 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.
|
|
*/
|
|
|
|
#include "call/adaptation/resource_adaptation_module_interface.h"
|
|
|
|
#include <utility>
|
|
|
|
namespace webrtc {
|
|
|
|
EncoderSettings::EncoderSettings(VideoEncoder::EncoderInfo encoder_info,
|
|
VideoEncoderConfig encoder_config,
|
|
VideoCodec video_codec)
|
|
: encoder_info_(std::move(encoder_info)),
|
|
encoder_config_(std::move(encoder_config)),
|
|
video_codec_(std::move(video_codec)) {}
|
|
|
|
const VideoEncoder::EncoderInfo& EncoderSettings::encoder_info() const {
|
|
return encoder_info_;
|
|
}
|
|
|
|
const VideoEncoderConfig& EncoderSettings::encoder_config() const {
|
|
return encoder_config_;
|
|
}
|
|
|
|
const VideoCodec& EncoderSettings::video_codec() const {
|
|
return video_codec_;
|
|
}
|
|
|
|
ResourceAdaptationModuleListener::~ResourceAdaptationModuleListener() {}
|
|
|
|
ResourceAdaptationModuleInterface::~ResourceAdaptationModuleInterface() {}
|
|
|
|
} // namespace webrtc
|