Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(754)

Unified Diff: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc

Issue 281453003: Cast: Simplify code path for RTCP sender report (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
index 3a72faf085aca9d11ce9274d60dea7395c7a14a9..f4c292fbb30206908378867e2810ea0e39c425a7 100644
--- a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
@@ -38,7 +38,7 @@ RtpPacketizer::RtpPacketizer(PacedSender* const transport,
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";
}
@@ -80,16 +80,6 @@ uint16 RtpPacketizer::NextSequenceNumber() {
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,
@@ -97,7 +87,6 @@ void RtpPacketizer::Cast(bool is_key,
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;
@@ -147,7 +136,7 @@ void RtpPacketizer::Cast(bool is_key,
data_iter += payload_length;
// Update stats.
- ++send_packets_count_;
+ ++send_packet_count_;
send_octet_count_ += payload_length;
packets.push_back(make_pair(key, packet));
}

Powered by Google App Engine
This is Rietveld 408576698