commit 3147e29c4e15df274a2d4a271341f77df640f550
author “Michael <mhoro@google.com> Sat Feb 19 16:48:50 2022 -0600
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Feb 21 19:40:44 2022 +0000
tree 42e61a5696838038a05eb3d2884a01f350986746
parent 1f6e4308ab071d1386a25ca5d833f89a1de58a3f

Refactor encoder-complexity param in VideoCodec w/backward compatibility

Move complexity parameter to the main VideoCodec class to enable
additional video codecs to use the parameter without creating a new
codec-specific structure.

Bug: webrtc:13694
Change-Id: Icb7cf640b178875d799f39ade8b5084e3222bb1c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251921
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Michael Horowitz <mhoro@google.com>
Cr-Commit-Position: refs/heads/main@{#36040}

api/video_codecs/video_codec.cc

diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index d850917..75c89e6 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -139,4 +139,23 @@
   return kVideoCodecGeneric;
 }
 
+VideoCodecComplexity VideoCodec::GetVideoEncoderComplexity() const {
+  if (complexity_.has_value()) {
+    return complexity_.value();
+  }
+  switch (codecType) {
+    case kVideoCodecVP8:
+      return VP8().complexity;
+    case kVideoCodecVP9:
+      return VP9().complexity;
+    default:
+      return VideoCodecComplexity::kComplexityNormal;
+  }
+}
+
+void VideoCodec::SetVideoEncoderComplexity(
+    VideoCodecComplexity complexity_setting) {
+  complexity_ = complexity_setting;
+}
+
 }  // namespace webrtc

api/video_codecs/video_codec.h

diff --git a/api/video_codecs/video_codec.h b/api/video_codecs/video_codec.h
index 1e6e21c..f00176d 100644
--- a/api/video_codecs/video_codec.h
+++ b/api/video_codecs/video_codec.h
@@ -109,6 +109,9 @@
     scalability_mode_ = std::string(scalability_mode);
   }
 
+  VideoCodecComplexity GetVideoEncoderComplexity() const;
+  void SetVideoEncoderComplexity(VideoCodecComplexity complexity_setting);
+
   // Public variables. TODO(hta): Make them private with accessors.
   VideoCodecType codecType;
 
@@ -169,6 +172,9 @@
   // This will allow removing the VideoCodec* types from this file.
   VideoCodecUnion codec_specific_;
   std::string 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_;
 };
 
 }  // namespace webrtc