Remove complexity parameter from video codec specific structs.

Now only using the complexity from the main VideoCodec settings.

Bug: webrtc:13694
Change-Id: I5a29df0fac0c0686bf5ea0b677f8946d23ef9888
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262762
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36912}
This commit is contained in:
Erik Språng
2022-05-17 13:51:01 +02:00
committed by WebRTC LUCI CQ
parent 88af20356f
commit 4da317f0bb
3 changed files with 6 additions and 20 deletions

View File

@ -43,7 +43,6 @@ struct VideoCodecVP8 {
bool operator!=(const VideoCodecVP8& other) const {
return !(*this == other);
}
VideoCodecComplexity complexity;
unsigned char numberOfTemporalLayers;
bool denoisingOn;
bool automaticResizeOn;
@ -63,7 +62,6 @@ struct VideoCodecVP9 {
bool operator!=(const VideoCodecVP9& other) const {
return !(*this == other);
}
VideoCodecComplexity complexity;
unsigned char numberOfTemporalLayers;
bool denoisingOn;
bool frameDroppingOn;
@ -181,7 +179,7 @@ class RTC_EXPORT VideoCodec {
absl::optional<ScalabilityMode> scalability_mode_;
// 'complexity_' indicates the CPU capability of the client. It's used to
// determine encoder CPU complexity (e.g., cpu_used for VP8, VP9. and AV1).
absl::optional<VideoCodecComplexity> complexity_;
VideoCodecComplexity complexity_;
// TODO(bugs.webrtc.org/6883): When unset, GetEnableFrameDrop checks the
// codec-specific settings.
absl::optional<bool> frame_drop_enabled_;