commit 164b3b3fced2186ff4f9e97ce6373d189481cd1b
author Danil Chapovalov <danilchap@webrtc.org> Fri Aug 30 13:59:33 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Sep 02 10:24:12 2024
tree 792d84a1cd023292254ee704f72d17ef56d4800f
parent cb00e16dcbbbb7b30b3f415c365ba9f6131ddda3

Introduce ModuleRtpRtcpImpl factory that accepts Environment

ModuleRtpRtcpImpl and ModuleRtpRtcpImpl2 share certain components, RtcpReceiver in particular.
To always have Environment in RtcpReceiver both legacy and new module need to propagate it.

No-Iwyu: suggests too many changes, better address them separately.
Bug: webrtc:362762208
Change-Id: I2c885f57e24f135229fb7cd9781126d663017b3d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361142
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42908}

modules/rtp_rtcp/BUILD.gn

diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 4873a74..ec05361 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -377,6 +377,7 @@
     "..:module_fec_api",
     "../../api:rtp_headers",
     "../../api:transport_api",
+    "../../api/environment",
     "../../api/rtc_event_log",
     "../../api/units:data_rate",
     "../../api/units:timestamp",

modules/rtp_rtcp/include/rtp_rtcp.h

diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h
index e56d5ef..ccf193e 100644
--- a/modules/rtp_rtcp/include/rtp_rtcp.h
+++ b/modules/rtp_rtcp/include/rtp_rtcp.h
@@ -13,21 +13,22 @@
 
 #include <memory>
 
-#include "absl/base/attributes.h"
+#include "api/environment/environment.h"
 #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h"
 
 namespace webrtc {
 
-class ABSL_DEPRECATED("") RtpRtcp : public RtpRtcpInterface {
+// A deprecated version of the RtpRtcp module.
+class [[deprecated("bugs.webrtc.org/42224904")]] RtpRtcp
+    : public RtpRtcpInterface {
  public:
-  // Instantiates a deprecated version of the RtpRtcp module.
-  static std::unique_ptr<RtpRtcp> ABSL_DEPRECATED("")
-      Create(const Configuration& configuration) {
-    return DEPRECATED_Create(configuration);
-  }
+  [[deprecated("bugs.webrtc.org/362762208")]]  //
+  static std::unique_ptr<RtpRtcp>
+  Create(const Configuration& configuration);
 
-  static std::unique_ptr<RtpRtcp> DEPRECATED_Create(
-      const Configuration& configuration);
+  [[deprecated("bugs.webrtc.org/42224904")]]  //
+  static std::unique_ptr<RtpRtcp>
+  Create(const Environment& env, const Configuration& configuration);
 
   // Process any pending tasks such as timeouts.
   virtual void Process() = 0;

modules/rtp_rtcp/source/rtp_rtcp_impl.cc

diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index eb4665b..e13b043 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -57,12 +57,24 @@
           &packet_history,
           config.paced_sender ? config.paced_sender : &non_paced_sender) {}
 
-std::unique_ptr<RtpRtcp> RtpRtcp::DEPRECATED_Create(
-    const Configuration& configuration) {
+std::unique_ptr<RtpRtcp> RtpRtcp::Create(const Configuration& configuration) {
   RTC_DCHECK(configuration.clock);
   return std::make_unique<ModuleRtpRtcpImpl>(configuration);
 }
 
+std::unique_ptr<RtpRtcp> RtpRtcp::Create(const Environment& env,
+                                         const Configuration& configuration) {
+  RTC_DCHECK(configuration.field_trials == nullptr);
+  RTC_DCHECK(configuration.clock == nullptr);
+  RTC_DCHECK(configuration.event_log == nullptr);
+
+  Configuration config = configuration;
+  config.field_trials = &env.field_trials();
+  config.clock = &env.clock();
+  config.event_log = &env.event_log();
+  return std::make_unique<ModuleRtpRtcpImpl>(config);
+}
+
 ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration)
     : rtcp_sender_(
           RTCPSender::Configuration::FromRtpRtcpConfiguration(configuration)),