commit 3f99d754a7a44f47c717ef90849de82c8badf449
author Philip Eliasson <philipel@webrtc.org> Tue Mar 04 12:02:57 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 04 13:21:13 2025
tree 3ba26c3d8c6bb3518a1ee53d46af1e62c88b767b
parent b4a81dbae4e8bc104ae982f3c7ff42ae2a7351e4

Remove WebRTC-Video-SimulcastIndependentFrameIds kill switch.

Bug: b/329063481, webrtc:42226243, webrtc:42225659
Change-Id: Iee9f03b2bbaf3fb99acd7ae1587decf4ca18fcff
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379701
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44034}

call/rtp_video_sender.cc

diff --git a/call/rtp_video_sender.cc b/call/rtp_video_sender.cc
index b51ac82..5174db6 100644
--- a/call/rtp_video_sender.cc
+++ b/call/rtp_video_sender.cc
@@ -425,8 +425,6 @@
       rtp_config_(rtp_config),
       transport_(transport),
       independent_frame_ids_(
-          !env.field_trials().IsDisabled(
-              "WebRTC-Video-SimulcastIndependentFrameIds") &&
           env.field_trials().IsDisabled("WebRTC-GenericDescriptorAuth")),
       transport_overhead_bytes_per_packet_(0),
       encoder_target_rate_bps_(0),

call/rtp_video_sender_unittest.cc

diff --git a/call/rtp_video_sender_unittest.cc b/call/rtp_video_sender_unittest.cc
index 8fc744f..e413646 100644
--- a/call/rtp_video_sender_unittest.cc
+++ b/call/rtp_video_sender_unittest.cc
@@ -929,66 +929,6 @@
   EXPECT_EQ(dd_s1.frame_number(), 1002);
 }
 
-TEST(RtpVideoSenderTest,
-     SimulcastNoIndependentFrameIdsIfIndependentFrameIdsDisabled) {
-  test::ExplicitKeyValueConfig field_trials(
-      "WebRTC-Video-SimulcastIndependentFrameIds/Disabled/");
-  const std::map<uint32_t, RtpPayloadState> kPayloadStates = {
-      {kSsrc1, {.shared_frame_id = 1000, .frame_id = 100}},
-      {kSsrc2, {.shared_frame_id = 1000, .frame_id = 200}}};
-  RtpVideoSenderTestFixture test({kSsrc1, kSsrc2}, {}, kPayloadType,
-                                 kPayloadStates, &field_trials);
-  test.SetSending(true);
-
-  RtpHeaderExtensionMap extensions;
-  extensions.Register<RtpDependencyDescriptorExtension>(
-      kDependencyDescriptorExtensionId);
-  std::vector<RtpPacket> sent_packets;
-  ON_CALL(test.transport(), SendRtp)
-      .WillByDefault([&](rtc::ArrayView<const uint8_t> packet,
-                         const PacketOptions& options) {
-        sent_packets.emplace_back(&extensions);
-        EXPECT_TRUE(sent_packets.back().Parse(packet));
-        return true;
-      });
-
-  const uint8_t kPayload[1] = {'a'};
-  EncodedImage encoded_image;
-  encoded_image.SetEncodedData(
-      EncodedImageBuffer::Create(kPayload, sizeof(kPayload)));
-
-  CodecSpecificInfo codec_specific;
-  codec_specific.codecType = VideoCodecType::kVideoCodecGeneric;
-  codec_specific.template_structure.emplace();
-  codec_specific.template_structure->num_decode_targets = 1;
-  codec_specific.template_structure->templates = {
-      FrameDependencyTemplate().T(0).Dtis("S"),
-      FrameDependencyTemplate().T(0).Dtis("S").FrameDiffs({1}),
-  };
-  codec_specific.generic_frame_info =
-      GenericFrameInfo::Builder().T(0).Dtis("S").Build();
-  encoded_image._frameType = VideoFrameType::kVideoFrameKey;
-  codec_specific.generic_frame_info->encoder_buffers = {{0, false, true}};
-
-  encoded_image.SetSimulcastIndex(0);
-  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
-            EncodedImageCallback::Result::OK);
-  encoded_image.SetSimulcastIndex(1);
-  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
-            EncodedImageCallback::Result::OK);
-
-  test.AdvanceTime(TimeDelta::Millis(33));
-  ASSERT_THAT(sent_packets, SizeIs(2));
-  DependencyDescriptorMandatory dd_s0;
-  DependencyDescriptorMandatory dd_s1;
-  ASSERT_TRUE(
-      sent_packets[0].GetExtension<RtpDependencyDescriptorExtension>(&dd_s0));
-  ASSERT_TRUE(
-      sent_packets[1].GetExtension<RtpDependencyDescriptorExtension>(&dd_s1));
-  EXPECT_EQ(dd_s0.frame_number(), 1001);
-  EXPECT_EQ(dd_s1.frame_number(), 1002);
-}
-
 TEST(RtpVideoSenderTest, MixedCodecSimulcastPayloadType) {
   // When multiple payload types are set, verify that the payload type switches
   // corresponding to the simulcast index.

experiments/field_trials.py

diff --git a/experiments/field_trials.py b/experiments/field_trials.py
index b64ab8f..95d87ac 100755
--- a/experiments/field_trials.py
+++ b/experiments/field_trials.py
@@ -176,9 +176,6 @@
     FieldTrial('WebRTC-Video-EncoderFallbackSettings',
                42231704,
                date(2024, 4, 1)),
-    FieldTrial('WebRTC-Video-SimulcastIndependentFrameIds',
-               42226243,
-               date(2024, 12, 1)),
     FieldTrial('WebRTC-VideoEncoderSettings',
                40252667,
                date(2024, 4, 1)),