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

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

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 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
« no previous file with comments | « media/cast/transport/rtp_sender/rtp_sender.h ('k') | media/cast/transport/transport/udp_transport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/transport/rtp_sender/rtp_sender.cc
diff --git a/media/cast/transport/rtp_sender/rtp_sender.cc b/media/cast/transport/rtp_sender/rtp_sender.cc
deleted file mode 100644
index a425b806e0d240d9be81c6026f29c4ba9f4f4bc9..0000000000000000000000000000000000000000
--- a/media/cast/transport/rtp_sender/rtp_sender.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-// 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_sender.h"
-
-#include "base/big_endian.h"
-#include "base/logging.h"
-#include "base/rand_util.h"
-#include "media/cast/transport/cast_transport_defines.h"
-#include "media/cast/transport/pacing/paced_sender.h"
-
-namespace media {
-namespace cast {
-namespace transport {
-
-namespace {
-
-// If there is only one referecne to the packet then copy the
-// reference and return.
-// Otherwise return a deep copy of the packet.
-PacketRef FastCopyPacket(const PacketRef& packet) {
- if (packet->HasOneRef())
- return packet;
- return make_scoped_refptr(new base::RefCountedData<Packet>(packet->data));
-}
-
-} // namespace
-
-RtpSender::RtpSender(
- base::TickClock* clock,
- const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
- PacedSender* const transport)
- : clock_(clock),
- transport_(transport),
- transport_task_runner_(transport_task_runner),
- weak_factory_(this) {
- // Randomly set sequence number start value.
- config_.sequence_number = base::RandInt(0, 65535);
-}
-
-RtpSender::~RtpSender() {}
-
-bool RtpSender::Initialize(const CastTransportRtpConfig& config) {
- storage_.reset(new PacketStorage(config.stored_frames));
- if (!storage_->IsValid()) {
- return false;
- }
- config_.ssrc = config.ssrc;
- config_.payload_type = config.rtp_payload_type;
- packetizer_.reset(new RtpPacketizer(transport_, storage_.get(), config_));
- return true;
-}
-
-void RtpSender::SendFrame(const EncodedFrame& frame) {
- DCHECK(packetizer_);
- packetizer_->SendFrameAsPackets(frame);
-}
-
-void RtpSender::ResendPackets(
- const MissingFramesAndPacketsMap& missing_frames_and_packets,
- bool cancel_rtx_if_not_in_list,
- base::TimeDelta dedupe_window) {
- DCHECK(storage_);
- // Iterate over all frames in the list.
- for (MissingFramesAndPacketsMap::const_iterator it =
- missing_frames_and_packets.begin();
- it != missing_frames_and_packets.end();
- ++it) {
- SendPacketVector packets_to_resend;
- uint8 frame_id = it->first;
- // Set of packets that the receiver wants us to re-send.
- // If empty, we need to re-send all packets for this frame.
- const PacketIdSet& missing_packet_set = it->second;
-
- bool resend_all = missing_packet_set.find(kRtcpCastAllPacketsLost) !=
- missing_packet_set.end();
- bool resend_last = missing_packet_set.find(kRtcpCastLastPacket) !=
- missing_packet_set.end();
-
- const SendPacketVector* stored_packets = storage_->GetFrame8(frame_id);
- if (!stored_packets)
- continue;
-
- for (SendPacketVector::const_iterator it = stored_packets->begin();
- it != stored_packets->end(); ++it) {
- const PacketKey& packet_key = it->first;
- const uint16 packet_id = packet_key.second.second;
-
- // Should we resend the packet?
- bool resend = resend_all;
-
- // Should we resend it because it's in the missing_packet_set?
- if (!resend &&
- missing_packet_set.find(packet_id) != missing_packet_set.end()) {
- resend = true;
- }
-
- // If we were asked to resend the last packet, check if it's the
- // last packet.
- if (!resend && resend_last && (it + 1) == stored_packets->end()) {
- resend = true;
- }
-
- if (resend) {
- // Resend packet to the network.
- VLOG(3) << "Resend " << static_cast<int>(frame_id) << ":"
- << packet_id;
- // Set a unique incremental sequence number for every packet.
- PacketRef packet_copy = FastCopyPacket(it->second);
- UpdateSequenceNumber(&packet_copy->data);
- packets_to_resend.push_back(std::make_pair(packet_key, packet_copy));
- } else if (cancel_rtx_if_not_in_list) {
- transport_->CancelSendingPacket(it->first);
- }
- }
- transport_->ResendPackets(packets_to_resend, dedupe_window);
- }
-}
-
-void RtpSender::UpdateSequenceNumber(Packet* packet) {
- // TODO(miu): This is an abstraction violation. This needs to be a part of
- // the overall packet (de)serialization consolidation.
- static const int kByteOffsetToSequenceNumber = 2;
- base::BigEndianWriter big_endian_writer(
- reinterpret_cast<char*>((&packet->front()) + kByteOffsetToSequenceNumber),
- sizeof(uint16));
- big_endian_writer.WriteU16(packetizer_->NextSequenceNumber());
-}
-
-} // namespace transport
-} // namespace cast
-} // namespace media
« no previous file with comments | « media/cast/transport/rtp_sender/rtp_sender.h ('k') | media/cast/transport/transport/udp_transport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698