Delete support for receiving RTCP RPSI and SLI messages.

webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/source/time_util.h"
 #include "webrtc/system_wrappers/include/ntp_time.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 namespace {
@@ skipping 13 matching lines @@
 
 class MockRtcpPacketTypeCounterObserver : public RtcpPacketTypeCounterObserver {
  public:
   MOCK_METHOD2(RtcpPacketTypesCounterUpdated,
                void(uint32_t, const RtcpPacketTypeCounter&));
 };
 
 class MockRtcpIntraFrameObserver : public RtcpIntraFrameObserver {
  public:
   MOCK_METHOD1(OnReceivedIntraFrameRequest, void(uint32_t));
-  MOCK_METHOD2(OnReceivedSLI, void(uint32_t, uint8_t));
-  MOCK_METHOD2(OnReceivedRPSI, void(uint32_t, uint64_t));
 };
 
 class MockRtcpCallbackImpl : public RtcpStatisticsCallback {
  public:
   MOCK_METHOD2(StatisticsUpdated, void(const RtcpStatistics&, uint32_t));
   MOCK_METHOD2(CNameChanged, void(const char*, uint32_t));
 };
 
 class MockTransportFeedbackObserver : public TransportFeedbackObserver {
  public:
@@ skipping 89 matching lines @@
 TEST_F(RtcpReceiverTest, InvalidFeedbackPacketIsIgnored) {
   // Too short feedback packet.
   const uint8_t bad_packet[] = {0x81, rtcp::Rtpfb::kPacketType, 0, 0};
 
   // TODO(danilchap): Add expectation RtcpPacketTypesCounterUpdated
   // is not called once parser would be adjusted to avoid that callback on
   // semi-valid packets.
   InjectRtcpPacket(bad_packet);
 }
 
-TEST_F(RtcpReceiverTest, RpsiWithFractionalPaddingIsIgnored) {
-  // Padding size represent fractional number of bytes.
-  const uint8_t kPaddingSizeBits = 0x0b;
-  // clang-format off
-  const uint8_t bad_packet[] = {0x80 | rtcp::Rpsi::kFeedbackMessageType,
-                                      rtcp::Rpsi::kPacketType, 0, 3,
-                                0x12, 0x34, 0x56, 0x78,
-                                0x98, 0x76, 0x54, 0x32,
-                                kPaddingSizeBits, 0x00, 0x00, 0x00};
-  // clang-format on
-  EXPECT_CALL(intra_frame_observer_, OnReceivedRPSI(_, _)).Times(0);
-  InjectRtcpPacket(bad_packet);
-}
-
-TEST_F(RtcpReceiverTest, RpsiWithTooLargePaddingIsIgnored) {
-  // Padding size exceeds packet size.
-  const uint8_t kPaddingSizeBits = 0xa8;
-  // clang-format off
-  const uint8_t bad_packet[] = {0x80 | rtcp::Rpsi::kFeedbackMessageType,
-                                      rtcp::Rpsi::kPacketType, 0, 3,
-                                0x12, 0x34, 0x56, 0x78,
-                                0x98, 0x76, 0x54, 0x32,
-                                kPaddingSizeBits, 0x00, 0x00, 0x00};
-  // clang-format on
-  EXPECT_CALL(intra_frame_observer_, OnReceivedRPSI(_, _)).Times(0);
-  InjectRtcpPacket(bad_packet);
-}
-
-// With parsing using rtcp classes this test will make no sense.
-// With current stateful parser this test was failing.
-TEST_F(RtcpReceiverTest, TwoHalfValidRpsiAreIgnored) {
-  // clang-format off
-  const uint8_t bad_packet[] = {0x80 | rtcp::Rpsi::kFeedbackMessageType,
-                                      rtcp::Rpsi::kPacketType, 0, 2,
-                                0x12, 0x34, 0x56, 0x78,
-                                0x98, 0x76, 0x54, 0x32,
-                                0x80 | rtcp::Rpsi::kFeedbackMessageType,
-                                      rtcp::Rpsi::kPacketType, 0, 2,
-                                0x12, 0x34, 0x56, 0x78,
-                                0x98, 0x76, 0x54, 0x32};
-  // clang-format on
-  EXPECT_CALL(intra_frame_observer_, OnReceivedRPSI(_, _)).Times(0);
-  InjectRtcpPacket(bad_packet);
-}
-
-TEST_F(RtcpReceiverTest, InjectRpsiPacket) {
-  const uint64_t kPictureId = 0x123456789;
-  rtcp::Rpsi rpsi;
-  rpsi.SetPictureId(kPictureId);
-
-  EXPECT_CALL(intra_frame_observer_, OnReceivedRPSI(_, kPictureId));
-  InjectRtcpPacket(rpsi);
-}
-
 TEST_F(RtcpReceiverTest, InjectSrPacket) {
   RTCPSenderInfo info;
   EXPECT_EQ(-1, rtcp_receiver_.SenderInfoReceived(&info));
 
   int64_t now = system_clock_.TimeInMilliseconds();
   rtcp::SenderReport sr;
   sr.SetSenderSsrc(kSenderSsrc);
 
   EXPECT_CALL(rtp_rtcp_impl_, OnReceivedRtcpReportBlocks(IsEmpty()));
   EXPECT_CALL(bandwidth_observer_,
@@ skipping 434 matching lines @@
 }
 
 TEST_F(RtcpReceiverTest, FirPacketNotToUsIgnored) {
   rtcp::Fir fir;
   fir.AddRequestTo(kNotToUsSsrc, 13);
 
   EXPECT_CALL(intra_frame_observer_, OnReceivedIntraFrameRequest(_)).Times(0);
   InjectRtcpPacket(fir);
 }
 
-TEST_F(RtcpReceiverTest, InjectSliPacket) {
-  const uint8_t kPictureId = 40;
-  rtcp::Sli sli;
-  sli.AddPictureId(kPictureId);
-
-  EXPECT_CALL(intra_frame_observer_, OnReceivedSLI(_, kPictureId));
-  InjectRtcpPacket(sli);
-}
-
 TEST_F(RtcpReceiverTest, ExtendedReportsPacketWithZeroReportBlocksIgnored) {
   rtcp::ExtendedReports xr;
   xr.SetSenderSsrc(kSenderSsrc);
 
   InjectRtcpPacket(xr);
 }
 
 // VOiP reports are ignored.
 TEST_F(RtcpReceiverTest, InjectExtendedReportsVoipPacket) {
   const uint8_t kLossRate = 123;
@@ skipping 603 matching lines @@
 
   rtcp::ExtendedReports xr;
   xr.SetTargetBitrate(bitrate);
 
   EXPECT_CALL(bitrate_allocation_observer_,
               OnBitrateAllocationUpdated(expected_allocation));
   InjectRtcpPacket(xr);
 }
 
 }  // namespace webrtc