Cast: Simplify code path for RTCP sender report

media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
 
 #include "base/big_endian.h"
 #include "base/logging.h"
 #include "media/cast/transport/pacing/paced_sender.h"
 
@@ skipping 20 matching lines @@
 
 RtpPacketizer::RtpPacketizer(PacedSender* const transport,
                              PacketStorage* packet_storage,
                              RtpPacketizerConfig rtp_packetizer_config)
     : config_(rtp_packetizer_config),
       transport_(transport),
       packet_storage_(packet_storage),
       sequence_number_(config_.sequence_number),
       rtp_timestamp_(0),
       packet_id_(0),
-      send_packets_count_(0),
+      send_packet_count_(0),
       send_octet_count_(0) {
   DCHECK(transport) << "Invalid argument";
 }
 
 RtpPacketizer::~RtpPacketizer() {}
 
 void RtpPacketizer::IncomingEncodedVideoFrame(
     const EncodedVideoFrame* video_frame,
     const base::TimeTicks& capture_time) {
   DCHECK(!config_.audio) << "Invalid state";
@@ skipping 21 matching lines @@
        audio_frame->rtp_timestamp,
        audio_frame->data,
        recorded_time);
 }
 
 uint16 RtpPacketizer::NextSequenceNumber() {
   ++sequence_number_;
   return sequence_number_ - 1;
 }
 
-bool RtpPacketizer::LastSentTimestamp(base::TimeTicks* time_sent,
-                                      uint32* rtp_timestamp) const {
-  if (time_last_sent_rtp_timestamp_.is_null())
-    return false;
-
-  *time_sent = time_last_sent_rtp_timestamp_;
-  *rtp_timestamp = rtp_timestamp_;
-  return true;
-}
-
 // TODO(mikhal): Switch to pass data with a const_ref.
 void RtpPacketizer::Cast(bool is_key,
                          uint32 frame_id,
                          uint32 reference_frame_id,
                          uint32 timestamp,
                          const std::string& data,
                          const base::TimeTicks& capture_time) {
-  time_last_sent_rtp_timestamp_ = capture_time;
   uint16 rtp_header_length = kCommonRtpHeaderLength + kCastRtpHeaderLength;
   uint16 max_length = config_.max_payload_length - rtp_header_length - 1;
   rtp_timestamp_ = timestamp;
 
   // Split the payload evenly (round number up).
   size_t num_packets = (data.size() + max_length) / max_length;
   size_t payload_length = (data.size() + num_packets) / num_packets;
   DCHECK_LE(payload_length, max_length) << "Invalid argument";
 
   SendPacketVector packets;
@@ skipping 29 matching lines @@
     PacketKey key = PacedPacketSender::MakePacketKey(capture_time,
                                                      config_.ssrc,
                                                      packet_id_);
 
     // Store packet.
     packet_storage_->StorePacket(frame_id, packet_id_, key, packet);
     ++packet_id_;
     data_iter += payload_length;
 
     // Update stats.
-    ++send_packets_count_;
+    ++send_packet_count_;
     send_octet_count_ += payload_length;
     packets.push_back(make_pair(key, packet));
   }
   DCHECK(packet_id_ == num_packets) << "Invalid state";
 
   // Send to network.
   transport_->SendPackets(packets);
 
   // Prepare for next frame.
   packet_id_ = 0;
@@ skipping 11 matching lines @@
       reinterpret_cast<char*>(&((*packet)[start_size])), 10);
   big_endian_writer.WriteU16(sequence_number_);
   big_endian_writer.WriteU32(time_stamp);
   big_endian_writer.WriteU32(config_.ssrc);
   ++sequence_number_;
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media