Revert of Unify rtcp packet setters

webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.cc

 /*
  *  Copyright (c) 2016 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 112 matching lines @@
         0x80 | static_cast<uint8_t>(picture_id_ >> (i * kPidBits));
   }
   packet[(*index)++] = static_cast<uint8_t>(picture_id_ & 0x7f);
   constexpr uint8_t kPadding = 0;
   for (size_t i = 0; i < padding_bytes; ++i)
     packet[(*index)++] = kPadding;
   RTC_CHECK_EQ(*index, index_end);
   return true;
 }
 
-void Rpsi::SetPayloadType(uint8_t payload) {
+void Rpsi::WithPayloadType(uint8_t payload) {
   RTC_DCHECK_LE(payload, 0x7f);
   payload_type_ = payload;
 }
 
-void Rpsi::SetPictureId(uint64_t picture_id) {
+void Rpsi::WithPictureId(uint64_t picture_id) {
   picture_id_ = picture_id;
   block_length_ = CalculateBlockLength(RequiredBytes(picture_id_));
 }
 
 size_t Rpsi::CalculateBlockLength(uint8_t bitstring_size_bytes) {
   return RtcpPacket::kHeaderLength + Psfb::kCommonFeedbackLength +
          Word32Align(2 + bitstring_size_bytes);
 }
 }  // namespace rtcp
 }  // namespace webrtc