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

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

Issue 493823002: Implement adaptive target delay extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: explicit masking Created 6 years, 4 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 unified diff | Download patch
« no previous file with comments | « media/cast/net/rtp/frame_buffer.h ('k') | media/cast/net/rtp/rtp_defines.h » ('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/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 new_playout_delay_ms_(0),
16 is_key_frame_(false), 17 is_key_frame_(false),
17 total_data_size_(0), 18 total_data_size_(0),
18 last_referenced_frame_id_(0), 19 last_referenced_frame_id_(0),
19 packets_() {} 20 packets_() {}
20 21
21 FrameBuffer::~FrameBuffer() {} 22 FrameBuffer::~FrameBuffer() {}
22 23
23 void FrameBuffer::InsertPacket(const uint8* payload_data, 24 void FrameBuffer::InsertPacket(const uint8* payload_data,
24 size_t payload_size, 25 size_t payload_size,
25 const RtpCastHeader& rtp_header) { 26 const RtpCastHeader& rtp_header) {
26 // Is this the first packet in the frame? 27 // Is this the first packet in the frame?
27 if (packets_.empty()) { 28 if (packets_.empty()) {
28 frame_id_ = rtp_header.frame_id; 29 frame_id_ = rtp_header.frame_id;
29 max_packet_id_ = rtp_header.max_packet_id; 30 max_packet_id_ = rtp_header.max_packet_id;
30 is_key_frame_ = rtp_header.is_key_frame; 31 is_key_frame_ = rtp_header.is_key_frame;
32 new_playout_delay_ms_ = rtp_header.new_playout_delay_ms;
31 if (is_key_frame_) 33 if (is_key_frame_)
32 DCHECK_EQ(rtp_header.frame_id, rtp_header.reference_frame_id); 34 DCHECK_EQ(rtp_header.frame_id, rtp_header.reference_frame_id);
33 last_referenced_frame_id_ = rtp_header.reference_frame_id; 35 last_referenced_frame_id_ = rtp_header.reference_frame_id;
34 rtp_timestamp_ = rtp_header.rtp_timestamp; 36 rtp_timestamp_ = rtp_header.rtp_timestamp;
35 } 37 }
36 // Is this the correct frame? 38 // Is this the correct frame?
37 if (rtp_header.frame_id != frame_id_) 39 if (rtp_header.frame_id != frame_id_)
38 return; 40 return;
39 41
40 // Insert every packet only once. 42 // Insert every packet only once.
(...skipping 25 matching lines...) Expand all
66 // Frame is complete -> construct. 68 // Frame is complete -> construct.
67 if (is_key_frame_) 69 if (is_key_frame_)
68 frame->dependency = EncodedFrame::KEY; 70 frame->dependency = EncodedFrame::KEY;
69 else if (frame_id_ == last_referenced_frame_id_) 71 else if (frame_id_ == last_referenced_frame_id_)
70 frame->dependency = EncodedFrame::INDEPENDENT; 72 frame->dependency = EncodedFrame::INDEPENDENT;
71 else 73 else
72 frame->dependency = EncodedFrame::DEPENDENT; 74 frame->dependency = EncodedFrame::DEPENDENT;
73 frame->frame_id = frame_id_; 75 frame->frame_id = frame_id_;
74 frame->referenced_frame_id = last_referenced_frame_id_; 76 frame->referenced_frame_id = last_referenced_frame_id_;
75 frame->rtp_timestamp = rtp_timestamp_; 77 frame->rtp_timestamp = rtp_timestamp_;
78 frame->new_playout_delay_ms = new_playout_delay_ms_;
76 79
77 // Build the data vector. 80 // Build the data vector.
78 frame->data.clear(); 81 frame->data.clear();
79 frame->data.reserve(total_data_size_); 82 frame->data.reserve(total_data_size_);
80 PacketMap::const_iterator it; 83 PacketMap::const_iterator it;
81 for (it = packets_.begin(); it != packets_.end(); ++it) 84 for (it = packets_.begin(); it != packets_.end(); ++it)
82 frame->data.insert(frame->data.end(), it->second.begin(), it->second.end()); 85 frame->data.insert(frame->data.end(), it->second.begin(), it->second.end());
83 return true; 86 return true;
84 } 87 }
85 88
86 } // namespace cast 89 } // namespace cast
87 } // namespace media 90 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/net/rtp/frame_buffer.h ('k') | media/cast/net/rtp/rtp_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698