commit a1a7c638ece600a0d9e2a1f7d77e1a9050737e90
author Byoungchan Lee <daniel.l@hpcnt.com> Tue Jul 05 21:06:28 2022 +0900
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 05 13:28:33 2022 +0000
tree 8b41c2906921908f509aa8197436705b667f41c3
parent e1c707c40f666fe37b55576f66ffa849da3174d5

Let PCF.GetRtpSenderCapabilities return codecs' scalabilityModes.

Also move ScalabilityModeToString to api and add RTC_EXPORT so that
Chromium can use it.

Bug: chromium:986069
Change-Id: I5dbbb6de9b14ca20f3ae0630552dcd44595ad5ef
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267780
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Cr-Commit-Position: refs/heads/main@{#37444}

api/video_codecs/scalability_mode.h

diff --git a/api/video_codecs/scalability_mode.h b/api/video_codecs/scalability_mode.h
index a33b9e4..397e3d3 100644
--- a/api/video_codecs/scalability_mode.h
+++ b/api/video_codecs/scalability_mode.h
@@ -11,6 +11,12 @@
 #ifndef API_VIDEO_CODECS_SCALABILITY_MODE_H_
 #define API_VIDEO_CODECS_SCALABILITY_MODE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "absl/strings/string_view.h"
+#include "rtc_base/system/rtc_export.h"
+
 namespace webrtc {
 
 // Supported scalability modes. Most applications should use the
@@ -18,7 +24,7 @@
 // This list of currently recognized modes is intended for the api boundary
 // between webrtc and injected encoders. Any application usage outside of
 // injected encoders is strongly discouraged.
-enum class ScalabilityMode {
+enum class ScalabilityMode : uint8_t {
   kL1T1,
   kL1T2,
   kL1T2h,
@@ -48,5 +54,44 @@
   kS3T3,
 };
 
+inline constexpr ScalabilityMode kAllScalabilityModes[] = {
+    // clang-format off
+    ScalabilityMode::kL1T1,
+    ScalabilityMode::kL1T2,
+    ScalabilityMode::kL1T2h,
+    ScalabilityMode::kL1T3,
+    ScalabilityMode::kL1T3h,
+    ScalabilityMode::kL2T1,
+    ScalabilityMode::kL2T1h,
+    ScalabilityMode::kL2T1_KEY,
+    ScalabilityMode::kL2T2,
+    ScalabilityMode::kL2T2h,
+    ScalabilityMode::kL2T2_KEY,
+    ScalabilityMode::kL2T2_KEY_SHIFT,
+    ScalabilityMode::kL2T3,
+    ScalabilityMode::kL2T3h,
+    ScalabilityMode::kL2T3_KEY,
+    ScalabilityMode::kL3T1,
+    ScalabilityMode::kL3T1h,
+    ScalabilityMode::kL3T1_KEY,
+    ScalabilityMode::kL3T2,
+    ScalabilityMode::kL3T2h,
+    ScalabilityMode::kL3T2_KEY,
+    ScalabilityMode::kL3T3,
+    ScalabilityMode::kL3T3h,
+    ScalabilityMode::kL3T3_KEY,
+    ScalabilityMode::kS2T1,
+    ScalabilityMode::kS2T3,
+    ScalabilityMode::kS3T3,
+    // clang-format on
+};
+
+inline constexpr size_t kScalabilityModeCount =
+    sizeof(kAllScalabilityModes) / sizeof(ScalabilityMode);
+
+RTC_EXPORT
+absl::string_view ScalabilityModeToString(ScalabilityMode scalability_mode);
+
 }  // namespace webrtc
+
 #endif  // API_VIDEO_CODECS_SCALABILITY_MODE_H_