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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more 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
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/frame_buffer.h" 5 #include "media/cast/net/rtp/frame_buffer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 namespace cast { 10 namespace cast {
11 11
12 FrameBuffer::FrameBuffer() 12 FrameBuffer::FrameBuffer()
13 : frame_id_(0), 13 : frame_id_(0),
14 max_packet_id_(0), 14 max_packet_id_(0),
15 num_packets_received_(0), 15 num_packets_received_(0),
16 max_seen_packet_id_(0), 16 max_seen_packet_id_(0),
17 new_playout_delay_ms_(0), 17 new_playout_delay_ms_(0),
18 is_key_frame_(false), 18 is_key_frame_(false),
19 total_data_size_(0), 19 total_data_size_(0),
20 last_referenced_frame_id_(0), 20 last_referenced_frame_id_(0),
21 packets_() {} 21 packets_() {}
22 22
23 FrameBuffer::~FrameBuffer() {} 23 FrameBuffer::~FrameBuffer() {}
24 24
25 bool FrameBuffer::InsertPacket(const uint8* payload_data, 25 bool FrameBuffer::InsertPacket(const uint8_t* payload_data,
26 size_t payload_size, 26 size_t payload_size,
27 const RtpCastHeader& rtp_header) { 27 const RtpCastHeader& rtp_header) {
28 // Is this the first packet in the frame? 28 // Is this the first packet in the frame?
29 if (packets_.empty()) { 29 if (packets_.empty()) {
30 frame_id_ = rtp_header.frame_id; 30 frame_id_ = rtp_header.frame_id;
31 max_packet_id_ = rtp_header.max_packet_id; 31 max_packet_id_ = rtp_header.max_packet_id;
32 is_key_frame_ = rtp_header.is_key_frame; 32 is_key_frame_ = rtp_header.is_key_frame;
33 new_playout_delay_ms_ = rtp_header.new_playout_delay_ms; 33 new_playout_delay_ms_ = rtp_header.new_playout_delay_ms;
34 if (is_key_frame_) 34 if (is_key_frame_)
35 DCHECK_EQ(rtp_header.frame_id, rtp_header.reference_frame_id); 35 DCHECK_EQ(rtp_header.frame_id, rtp_header.reference_frame_id);
36 last_referenced_frame_id_ = rtp_header.reference_frame_id; 36 last_referenced_frame_id_ = rtp_header.reference_frame_id;
37 rtp_timestamp_ = rtp_header.rtp_timestamp; 37 rtp_timestamp_ = rtp_header.rtp_timestamp;
38 } 38 }
39 // Is this the correct frame? 39 // Is this the correct frame?
40 if (rtp_header.frame_id != frame_id_) 40 if (rtp_header.frame_id != frame_id_)
41 return false; 41 return false;
42 42
43 // Insert every packet only once. 43 // Insert every packet only once.
44 if (packets_.find(rtp_header.packet_id) != packets_.end()) { 44 if (packets_.find(rtp_header.packet_id) != packets_.end()) {
45 return false; 45 return false;
46 } 46 }
47 47
48 std::vector<uint8> data; 48 std::vector<uint8_t> data;
49 std::pair<PacketMap::iterator, bool> retval = 49 std::pair<PacketMap::iterator, bool> retval =
50 packets_.insert(make_pair(rtp_header.packet_id, data)); 50 packets_.insert(make_pair(rtp_header.packet_id, data));
51 51
52 // Insert the packet. 52 // Insert the packet.
53 retval.first->second.resize(payload_size); 53 retval.first->second.resize(payload_size);
54 std::copy( 54 std::copy(
55 payload_data, payload_data + payload_size, retval.first->second.begin()); 55 payload_data, payload_data + payload_size, retval.first->second.begin());
56 56
57 ++num_packets_received_; 57 ++num_packets_received_;
58 max_seen_packet_id_ = std::max(max_seen_packet_id_, rtp_header.packet_id); 58 max_seen_packet_id_ = std::max(max_seen_packet_id_, rtp_header.packet_id);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 107 }
108 while (packet <= maximum) { 108 while (packet <= maximum) {
109 missing_packets->insert(packet); 109 missing_packets->insert(packet);
110 packet++; 110 packet++;
111 } 111 }
112 } 112 }
113 113
114 114
115 } // namespace cast 115 } // namespace cast
116 } // namespace media 116 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698