Delete support for receiving RTCP RPSI and SLI messages.

webrtc/modules/rtp_rtcp/source/rtcp_receiver.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 15 matching lines @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.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/tmmbn.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/rtp_rtcp_config.h"
 #include "webrtc/modules/rtp_rtcp/source/time_util.h"
 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
 #include "webrtc/system_wrappers/include/ntp_time.h"
 
 namespace webrtc {
 namespace {
 
 using rtcp::CommonHeader;
 using rtcp::ReportBlock;
 
 // The number of RTCP time intervals needed to trigger a timeout.
 const int kRrTimeoutIntervals = 3;
 
 const int64_t kMaxWarningLogIntervalMs = 10000;
 const int64_t kRtcpMinFrameLengthMs = 17;
 
 }  // namespace
 
 struct RTCPReceiver::PacketInformation {
   uint32_t packet_type_flags = 0;  // RTCPPacketTypeFlags bit field.
 
   uint32_t remote_ssrc = 0;
   std::vector<uint16_t> nack_sequence_numbers;
   ReportBlockList report_blocks;
   int64_t rtt_ms = 0;
-  uint8_t sli_picture_id = 0;
-  uint64_t rpsi_picture_id = 0;
   uint32_t receiver_estimated_max_bitrate_bps = 0;
   std::unique_ptr<rtcp::TransportFeedback> transport_feedback;
   rtc::Optional<BitrateAllocation> target_bitrate_allocation;
 };
 
 // Structure for handing TMMBR and TMMBN rtcp messages (RFC5104, section 3.5.4).
 struct RTCPReceiver::TmmbrInformation {
   struct TimedTmmbrItem {
     rtcp::TmmbItem tmmbr_item;
     int64_t last_updated_ms;
@@ skipping 271 matching lines @@
           default:
             ++num_skipped_packets_;
             break;
         }
         break;
       case rtcp::Psfb::kPacketType:
         switch (rtcp_block.fmt()) {
           case rtcp::Pli::kFeedbackMessageType:
             HandlePli(rtcp_block, packet_information);
             break;
-          case rtcp::Sli::kFeedbackMessageType:
-            HandleSli(rtcp_block, packet_information);
-            break;
-          case rtcp::Rpsi::kFeedbackMessageType:
-            HandleRpsi(rtcp_block, packet_information);
-            break;
           case rtcp::Fir::kFeedbackMessageType:
             HandleFir(rtcp_block, packet_information);
             break;
           case rtcp::Remb::kFeedbackMessageType:
             HandlePsfbApp(rtcp_block, packet_information);
             break;
           default:
             ++num_skipped_packets_;
             break;
         }
@@ skipping 454 matching lines @@
                                PacketInformation* packet_information) {
   rtcp::RapidResyncRequest sr_req;
   if (!sr_req.Parse(rtcp_block)) {
     ++num_skipped_packets_;
     return;
   }
 
   packet_information->packet_type_flags |= kRtcpSrReq;
 }
 
-void RTCPReceiver::HandleSli(const CommonHeader& rtcp_block,
-                             PacketInformation* packet_information) {
-  rtcp::Sli sli;
-  if (!sli.Parse(rtcp_block)) {
-    ++num_skipped_packets_;
-    return;
-  }
-
-  for (const rtcp::Sli::Macroblocks& item : sli.macroblocks()) {
-    // In theory there could be multiple slices lost.
-    // Received signal that we need to refresh a slice.
-    packet_information->packet_type_flags |= kRtcpSli;
-    packet_information->sli_picture_id = item.picture_id();
-  }
-}
-
-void RTCPReceiver::HandleRpsi(const CommonHeader& rtcp_block,
-                              PacketInformation* packet_information) {
-  rtcp::Rpsi rpsi;
-  if (!rpsi.Parse(rtcp_block)) {
-    ++num_skipped_packets_;
-    return;
-  }
-
-  // Received signal that we have a confirmed reference picture.
-  packet_information->packet_type_flags |= kRtcpRpsi;
-  packet_information->rpsi_picture_id = rpsi.picture_id();
-}
-
 void RTCPReceiver::HandlePsfbApp(const CommonHeader& rtcp_block,
                                  PacketInformation* packet_information) {
   rtcp::Remb remb;
   if (remb.Parse(rtcp_block)) {
     packet_information->packet_type_flags |= kRtcpRemb;
     packet_information->receiver_estimated_max_bitrate_bps = remb.bitrate_bps();
     return;
   }
 
   ++num_skipped_packets_;
@@ skipping 115 matching lines @@
         (packet_information.packet_type_flags & kRtcpFir)) {
       if (packet_information.packet_type_flags & kRtcpPli) {
         LOG(LS_VERBOSE) << "Incoming PLI from SSRC "
                         << packet_information.remote_ssrc;
       } else {
         LOG(LS_VERBOSE) << "Incoming FIR from SSRC "
                         << packet_information.remote_ssrc;
       }
       rtcp_intra_frame_observer_->OnReceivedIntraFrameRequest(local_ssrc);
     }
-    if (packet_information.packet_type_flags & kRtcpSli) {
-      rtcp_intra_frame_observer_->OnReceivedSLI(
-          local_ssrc, packet_information.sli_picture_id);
-    }
-    if (packet_information.packet_type_flags & kRtcpRpsi) {
-      rtcp_intra_frame_observer_->OnReceivedRPSI(
-          local_ssrc, packet_information.rpsi_picture_id);
-    }
   }
   if (rtcp_bandwidth_observer_) {
     RTC_DCHECK(!receiver_only_);
     if (packet_information.packet_type_flags & kRtcpRemb) {
       LOG(LS_VERBOSE) << "Incoming REMB: "
                       << packet_information.receiver_estimated_max_bitrate_bps;
       rtcp_bandwidth_observer_->OnReceivedEstimatedBitrate(
           packet_information.receiver_estimated_max_bitrate_bps);
     }
     if ((packet_information.packet_type_flags & kRtcpSr) ||
@@ skipping 71 matching lines @@
       } else {
         candidates.push_back(it->second.tmmbr_item);
         ++it;
       }
     }
   }
   return candidates;
 }
 
 }  // namespace webrtc