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

Side by Side Diff: media/cast/net/rtp/rtp_packetizer.cc

Issue 1487223002: Change PacketKey to be unique for each frame packet by including (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
« no previous file with comments | « media/cast/net/rtp/packet_storage_unittest.cc ('k') | media/cast/net/rtp/rtp_sender.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/net/rtp/rtp_packetizer.h" 5 #include "media/cast/net/rtp/rtp_packetizer.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/big_endian.h" 9 #include "base/big_endian.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 packet->data.push_back( 100 packet->data.push_back(
101 static_cast<uint8>(frame.new_playout_delay_ms)); 101 static_cast<uint8>(frame.new_playout_delay_ms));
102 } 102 }
103 103
104 // Copy payload data. 104 // Copy payload data.
105 packet->data.insert(packet->data.end(), 105 packet->data.insert(packet->data.end(),
106 data_iter, 106 data_iter,
107 data_iter + payload_length); 107 data_iter + payload_length);
108 data_iter += payload_length; 108 data_iter += payload_length;
109 109
110 const PacketKey key = 110 const PacketKey key = PacedPacketSender::MakePacketKey(
111 PacedPacketSender::MakePacketKey(frame.reference_time, 111 PacketKey::RTP, frame.frame_id, config_.ssrc, packet_id_++);
112 config_.ssrc,
113 packet_id_++);
114 packets.push_back(make_pair(key, packet)); 112 packets.push_back(make_pair(key, packet));
115 113
116 // Update stats. 114 // Update stats.
117 ++send_packet_count_; 115 ++send_packet_count_;
118 send_octet_count_ += payload_length; 116 send_octet_count_ += payload_length;
119 } 117 }
120 DCHECK(packet_id_ == num_packets) << "Invalid state"; 118 DCHECK(packet_id_ == num_packets) << "Invalid state";
121 119
122 packet_storage_->StoreFrame(frame.frame_id, packets); 120 packet_storage_->StoreFrame(frame.frame_id, packets);
123 121
(...skipping 15 matching lines...) Expand all
139 base::BigEndianWriter big_endian_writer( 137 base::BigEndianWriter big_endian_writer(
140 reinterpret_cast<char*>(&((*packet)[start_size])), 10); 138 reinterpret_cast<char*>(&((*packet)[start_size])), 10);
141 big_endian_writer.WriteU16(sequence_number_); 139 big_endian_writer.WriteU16(sequence_number_);
142 big_endian_writer.WriteU32(time_stamp); 140 big_endian_writer.WriteU32(time_stamp);
143 big_endian_writer.WriteU32(config_.ssrc); 141 big_endian_writer.WriteU32(config_.ssrc);
144 ++sequence_number_; 142 ++sequence_number_;
145 } 143 }
146 144
147 } // namespace cast 145 } // namespace cast
148 } // namespace media 146 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/net/rtp/packet_storage_unittest.cc ('k') | media/cast/net/rtp/rtp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698