Stop mentioning RTPFragmentationHeader in call/

Bug: webrtc:6471
Change-Id: I07ab95524369fa996b8dde68f421281989d04e0c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181461
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31921}

call/rtp_video_sender.cc

@@ -505,8 +505,7 @@ bool RtpVideoSender::IsActiveLocked() {
 
 EncodedImageCallback::Result RtpVideoSender::OnEncodedImage(
     const EncodedImage& encoded_image,
-    const CodecSpecificInfo* codec_specific_info,
-    const RTPFragmentationHeader* /*fragmentation*/) {
+    const CodecSpecificInfo* codec_specific_info) {
   fec_controller_->UpdateWithEncodedData(encoded_image.size(),
                                          encoded_image._frameType);
   MutexLock lock(&mutex_);

call/rtp_video_sender.h

@@ -44,7 +44,6 @@
 namespace webrtc {
 
 class FrameEncryptorInterface;
-class RTPFragmentationHeader;
 class RtpTransportControllerSendInterface;
 
 namespace webrtc_internal_rtp_video_sender {
@@ -134,8 +133,7 @@ class RtpVideoSender : public RtpVideoSenderInterface,
   // Returns 0 if the packet was routed / sent, -1 otherwise.
   EncodedImageCallback::Result OnEncodedImage(
       const EncodedImage& encoded_image,
-      const CodecSpecificInfo* codec_specific_info,
-      const RTPFragmentationHeader* fragmentation)
+      const CodecSpecificInfo* codec_specific_info)
       RTC_LOCKS_EXCLUDED(mutex_) override;
 
   void OnBitrateAllocationUpdated(const VideoBitrateAllocation& bitrate)

call/rtp_video_sender_unittest.cc

@@ -213,24 +213,20 @@ TEST(RtpVideoSenderTest, SendOnOneModule) {
   encoded_image.SetEncodedData(EncodedImageBuffer::Create(&kPayload, 1));
 
   RtpVideoSenderTestFixture test({kSsrc1}, {kRtxSsrc1}, kPayloadType, {});
-  EXPECT_NE(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_NE(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
 
   test.router()->SetActive(true);
-  EXPECT_EQ(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_EQ(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
 
   test.router()->SetActive(false);
-  EXPECT_NE(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_NE(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
 
   test.router()->SetActive(true);
-  EXPECT_EQ(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_EQ(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
 }
 
 TEST(RtpVideoSenderTest, SendSimulcastSetActive) {
@@ -249,27 +245,19 @@ TEST(RtpVideoSenderTest, SendSimulcastSetActive) {
 
   test.router()->SetActive(true);
   EXPECT_EQ(EncodedImageCallback::Result::OK,
-            test.router()
-                ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
-                .error);
+            test.router()->OnEncodedImage(encoded_image_1, &codec_info).error);
 
   EncodedImage encoded_image_2(encoded_image_1);
   encoded_image_2.SetSpatialIndex(1);
   EXPECT_EQ(EncodedImageCallback::Result::OK,
-            test.router()
-                ->OnEncodedImage(encoded_image_2, &codec_info, nullptr)
-                .error);
+            test.router()->OnEncodedImage(encoded_image_2, &codec_info).error);
 
   // Inactive.
   test.router()->SetActive(false);
   EXPECT_NE(EncodedImageCallback::Result::OK,
-            test.router()
-                ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
-                .error);
+            test.router()->OnEncodedImage(encoded_image_1, &codec_info).error);
   EXPECT_NE(EncodedImageCallback::Result::OK,
-            test.router()
-                ->OnEncodedImage(encoded_image_2, &codec_info, nullptr)
-                .error);
+            test.router()->OnEncodedImage(encoded_image_2, &codec_info).error);
 }
 
 // Tests how setting individual rtp modules to active affects the overall
@@ -297,9 +285,7 @@ TEST(RtpVideoSenderTest, SendSimulcastSetActiveModules) {
   std::vector<bool> active_modules({true, false});
   test.router()->SetActiveModules(active_modules);
   EXPECT_EQ(EncodedImageCallback::Result::OK,
-            test.router()
-                ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
-                .error);
+            test.router()->OnEncodedImage(encoded_image_1, &codec_info).error);
 
   // Setting both streams to inactive will turn the payload router to
   // inactive.
@@ -308,13 +294,9 @@ TEST(RtpVideoSenderTest, SendSimulcastSetActiveModules) {
   // An incoming encoded image will not ask the module to send outgoing data
   // because the payload router is inactive.
   EXPECT_NE(EncodedImageCallback::Result::OK,
-            test.router()
-                ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
-                .error);
+            test.router()->OnEncodedImage(encoded_image_1, &codec_info).error);
   EXPECT_NE(EncodedImageCallback::Result::OK,
-            test.router()
-                ->OnEncodedImage(encoded_image_1, &codec_info, nullptr)
-                .error);
+            test.router()->OnEncodedImage(encoded_image_1, &codec_info).error);
 }
 
 TEST(RtpVideoSenderTest, CreateWithNoPreviousStates) {
@@ -381,9 +363,8 @@ TEST(RtpVideoSenderTest, FrameCountCallbacks) {
 
   // No callbacks when not active.
   EXPECT_CALL(callback, FrameCountUpdated).Times(0);
-  EXPECT_NE(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_NE(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
   ::testing::Mock::VerifyAndClearExpectations(&callback);
 
   test.router()->SetActive(true);
@@ -391,9 +372,8 @@ TEST(RtpVideoSenderTest, FrameCountCallbacks) {
   FrameCounts frame_counts;
   EXPECT_CALL(callback, FrameCountUpdated(_, kSsrc1))
       .WillOnce(SaveArg<0>(&frame_counts));
-  EXPECT_EQ(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_EQ(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
 
   EXPECT_EQ(1, frame_counts.key_frames);
   EXPECT_EQ(0, frame_counts.delta_frames);
@@ -403,9 +383,8 @@ TEST(RtpVideoSenderTest, FrameCountCallbacks) {
   encoded_image._frameType = VideoFrameType::kVideoFrameDelta;
   EXPECT_CALL(callback, FrameCountUpdated(_, kSsrc1))
       .WillOnce(SaveArg<0>(&frame_counts));
-  EXPECT_EQ(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_EQ(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
 
   EXPECT_EQ(1, frame_counts.key_frames);
   EXPECT_EQ(1, frame_counts.delta_frames);
@@ -440,14 +419,12 @@ TEST(RtpVideoSenderTest, DoesNotRetrasmitAckedPackets) {
         transport_sequence_numbers.push_back(options.packet_id);
         return true;
       });
-  EXPECT_EQ(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_EQ(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
   encoded_image.SetTimestamp(2);
   encoded_image.capture_time_ms_ = 3;
-  EXPECT_EQ(
-      EncodedImageCallback::Result::OK,
-      test.router()->OnEncodedImage(encoded_image, nullptr, nullptr).error);
+  EXPECT_EQ(EncodedImageCallback::Result::OK,
+            test.router()->OnEncodedImage(encoded_image, nullptr).error);
 
   test.AdvanceTime(TimeDelta::Millis(33));
 
@@ -612,9 +589,7 @@ TEST(RtpVideoSenderTest, EarlyRetransmits) {
             EXPECT_EQ(rtp_packet.Ssrc(), kSsrc1);
             return true;
           });
-  EXPECT_EQ(test.router()
-                ->OnEncodedImage(encoded_image, &codec_specific, nullptr)
-                .error,
+  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
             EncodedImageCallback::Result::OK);
 
   test.AdvanceTime(TimeDelta::Millis(33));
@@ -634,9 +609,7 @@ TEST(RtpVideoSenderTest, EarlyRetransmits) {
             EXPECT_EQ(rtp_packet.Ssrc(), kSsrc2);
             return true;
           });
-  EXPECT_EQ(test.router()
-                ->OnEncodedImage(encoded_image, &codec_specific, nullptr)
-                .error,
+  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
             EncodedImageCallback::Result::OK);
   test.AdvanceTime(TimeDelta::Millis(33));
 
@@ -716,9 +689,7 @@ TEST(RtpVideoSenderTest, SupportsDependencyDescriptor) {
   codec_specific.generic_frame_info =
       GenericFrameInfo::Builder().T(0).Dtis("S").Build();
   codec_specific.generic_frame_info->encoder_buffers = {{0, false, true}};
-  EXPECT_EQ(test.router()
-                ->OnEncodedImage(encoded_image, &codec_specific, nullptr)
-                .error,
+  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
             EncodedImageCallback::Result::OK);
   test.AdvanceTime(TimeDelta::Millis(33));
   ASSERT_THAT(sent_packets, SizeIs(1));
@@ -731,9 +702,7 @@ TEST(RtpVideoSenderTest, SupportsDependencyDescriptor) {
   codec_specific.generic_frame_info =
       GenericFrameInfo::Builder().T(1).Dtis("D").Build();
   codec_specific.generic_frame_info->encoder_buffers = {{0, true, false}};
-  EXPECT_EQ(test.router()
-                ->OnEncodedImage(encoded_image, &codec_specific, nullptr)
-                .error,
+  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
             EncodedImageCallback::Result::OK);
   test.AdvanceTime(TimeDelta::Millis(33));
   ASSERT_THAT(sent_packets, SizeIs(2));
@@ -780,9 +749,7 @@ TEST(RtpVideoSenderTest, SupportsStoppingUsingDependencyDescriptor) {
   codec_specific.generic_frame_info =
       GenericFrameInfo::Builder().T(0).Dtis("S").Build();
   codec_specific.generic_frame_info->encoder_buffers = {{0, false, true}};
-  EXPECT_EQ(test.router()
-                ->OnEncodedImage(encoded_image, &codec_specific, nullptr)
-                .error,
+  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
             EncodedImageCallback::Result::OK);
   test.AdvanceTime(TimeDelta::Millis(33));
   ASSERT_THAT(sent_packets, SizeIs(1));
@@ -792,9 +759,7 @@ TEST(RtpVideoSenderTest, SupportsStoppingUsingDependencyDescriptor) {
   // Send in a new key frame without the support for the dependency descriptor.
   encoded_image._frameType = VideoFrameType::kVideoFrameKey;
   codec_specific.template_structure = absl::nullopt;
-  EXPECT_EQ(test.router()
-                ->OnEncodedImage(encoded_image, &codec_specific, nullptr)
-                .error,
+  EXPECT_EQ(test.router()->OnEncodedImage(encoded_image, &codec_specific).error,
             EncodedImageCallback::Result::OK);
   test.AdvanceTime(TimeDelta::Millis(33));
   ASSERT_THAT(sent_packets, SizeIs(2));