Remove WebRTC-RtcEventLogEncodeDependencyDescriptor field trial Bug: webrtc:42225280 Change-Id: Ieafe836ff7c69cefa5d860abb4abb617d5bf4dd6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/456500 Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org> Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47171}

diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index 9faa63a..679fa3c 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py

@@ -200,9 +200,6 @@
     FieldTrial('WebRTC-ReceiveBufferSize',
                42225927,
                date(2024, 4, 1)),
-    FieldTrial('WebRTC-RtcEventLogEncodeDependencyDescriptor',
-               42225280,
-               date(2024, 4, 1)),
     FieldTrial('WebRTC-RtcEventLogEncodeNetEqSetMinimumDelayKillSwitch',
                42225058,
                date(2024, 4, 1)),

diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
index 5d1342e..67667fc 100644
--- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
+++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc

@@ -465,23 +465,18 @@
   }
 
   {
-    // TODO(webrtc:14975) Remove this kill switch after DD in RTC event log has
-    //                    been rolled out.
-    if (encode_dependency_descriptor_) {
-      std::vector<std::span<const uint8_t>> raw_dds(batch.size());
-      bool has_dd = false;
-      for (size_t i = 0; i < batch.size(); ++i) {
-        raw_dds[i] =
-            batch[i]
-                ->template GetRawExtension<RtpDependencyDescriptorExtension>();
-        has_dd |= !raw_dds[i].empty();
-      }
-      if (has_dd) {
-        if (auto dd_encoded =
-                RtcEventLogDependencyDescriptorEncoderDecoder::Encode(
-                    raw_dds)) {
-          *proto_batch->mutable_dependency_descriptor() = *dd_encoded;
-        }
+    std::vector<std::span<const uint8_t>> raw_dds(batch.size());
+    bool has_dd = false;
+    for (size_t i = 0; i < batch.size(); ++i) {
+      raw_dds[i] =
+          batch[i]
+              ->template GetRawExtension<RtpDependencyDescriptorExtension>();
+      has_dd |= !raw_dds[i].empty();
+    }
+    if (has_dd) {
+      if (auto dd_encoded =
+              RtcEventLogDependencyDescriptorEncoderDecoder::Encode(raw_dds)) {
+        *proto_batch->mutable_dependency_descriptor() = *dd_encoded;
       }
     }
   }
@@ -704,9 +699,7 @@
 RtcEventLogEncoderNewFormat::RtcEventLogEncoderNewFormat(
     const FieldTrialsView& field_trials)
     : encode_neteq_set_minimum_delay_kill_switch_(field_trials.IsEnabled(
-          "WebRTC-RtcEventLogEncodeNetEqSetMinimumDelayKillSwitch")),
-      encode_dependency_descriptor_(!field_trials.IsDisabled(
-          "WebRTC-RtcEventLogEncodeDependencyDescriptor")) {}
+          "WebRTC-RtcEventLogEncodeNetEqSetMinimumDelayKillSwitch")) {}
 
 std::string RtcEventLogEncoderNewFormat::EncodeLogStart(int64_t timestamp_us,
                                                         int64_t utc_time_us) {

diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h
index 099c5df..85a7515 100644
--- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h
+++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h

@@ -152,7 +152,6 @@
   void EncodeRtpPacket(const Batch& batch, ProtoType* proto_batch);
 
   const bool encode_neteq_set_minimum_delay_kill_switch_;
-  const bool encode_dependency_descriptor_;
 };
 
 }  // namespace webrtc

diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc
index 9e604f0..409dfc0 100644
--- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc
+++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc

@@ -23,7 +23,6 @@
 #include <utility>
 #include <vector>
 
-#include "api/field_trials.h"
 #include "api/field_trials_view.h"
 #include "api/rtc_event_log/rtc_event.h"
 #include "api/rtc_event_log/rtc_event_log.h"
@@ -1308,23 +1307,6 @@
   TestRtpPackets<RtcEventRtpPacketOutgoing, LoggedRtpPacketOutgoing>(*encoder);
 }
 
-TEST_P(RtcEventLogEncoderTest,
-       RtcEventRtpPacketIncomingNoDependencyDescriptor) {
-  FieldTrials no_dd = CreateTestFieldTrials(
-      "WebRTC-RtcEventLogEncodeDependencyDescriptor/Disabled/");
-  std::unique_ptr<RtcEventLogEncoder> encoder = CreateEncoder(no_dd);
-  verifier_.ExpectDependencyDescriptorExtensionIsSet(false);
-  TestRtpPackets<RtcEventRtpPacketIncoming, LoggedRtpPacketIncoming>(*encoder);
-}
-
-TEST_P(RtcEventLogEncoderTest,
-       RtcEventRtpPacketOutgoingNoDependencyDescriptor) {
-  FieldTrials no_dd = CreateTestFieldTrials(
-      "WebRTC-RtcEventLogEncodeDependencyDescriptor/Disabled/");
-  std::unique_ptr<RtcEventLogEncoder> encoder = CreateEncoder(no_dd);
-  verifier_.ExpectDependencyDescriptorExtensionIsSet(false);
-  TestRtpPackets<RtcEventRtpPacketOutgoing, LoggedRtpPacketOutgoing>(*encoder);
-}
 
 // TODO(eladalon/terelius): Test with multiple events in the batch.
 TEST_P(RtcEventLogEncoderTest, RtcEventVideoReceiveStreamConfig) {