Revert of Unify rtcp packet setters

webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h

 /*
  *  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 31 matching lines @@
    private:
     uint32_t item_;
   };
 
   Sli() {}
   ~Sli() override {}
 
   // Parse assumes header is already parsed and validated.
   bool Parse(const CommonHeader& packet);
 
-  void AddPictureId(uint8_t picture_id) {
-    items_.emplace_back(picture_id, 0, 0x1fff);
-  }
-  void AddPictureId(uint8_t picture_id,
-                    uint16_t first_macroblock,
-                    uint16_t number_macroblocks) {
-    items_.emplace_back(picture_id, first_macroblock, number_macroblocks);
+  void WithPictureId(uint8_t picture_id,
+                     uint16_t first_macroblock = 0,
+                     uint16_t number_macroblocks = 0x1fff) {
+    items_.push_back(
+        Macroblocks(picture_id, first_macroblock, number_macroblocks));
   }
 
   const std::vector<Macroblocks>& macroblocks() const { return items_; }
 
  protected:
   bool Create(uint8_t* packet,
               size_t* index,
               size_t max_length,
               RtcpPacket::PacketReadyCallback* callback) const override;
 
  private:
   size_t BlockLength() const override {
     return RtcpPacket::kHeaderLength + Psfb::kCommonFeedbackLength +
            items_.size() * Macroblocks::kLength;
   }
 
   std::vector<Macroblocks> items_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Sli);
 };
 
 }  // namespace rtcp
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_SLI_H_