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

Side by Side Diff: media/cast/framer/framer.cc

Issue 148663003: Cast: Refactor framer to Clang format (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « media/cast/framer/frame_id_map.cc ('k') | media/cast/framer/framer_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/framer/framer.h" 5 #include "media/cast/framer/framer.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 typedef FrameList::const_iterator ConstFrameIterator; 12 typedef FrameList::const_iterator ConstFrameIterator;
13 13
14 Framer::Framer(base::TickClock* clock, 14 Framer::Framer(base::TickClock* clock,
15 RtpPayloadFeedback* incoming_payload_feedback, 15 RtpPayloadFeedback* incoming_payload_feedback,
16 uint32 ssrc, 16 uint32 ssrc,
17 bool decoder_faster_than_max_frame_rate, 17 bool decoder_faster_than_max_frame_rate,
18 int max_unacked_frames) 18 int max_unacked_frames)
19 : decoder_faster_than_max_frame_rate_(decoder_faster_than_max_frame_rate), 19 : decoder_faster_than_max_frame_rate_(decoder_faster_than_max_frame_rate),
20 cast_msg_builder_(new CastMessageBuilder(clock, incoming_payload_feedback, 20 cast_msg_builder_(
21 &frame_id_map_, ssrc, decoder_faster_than_max_frame_rate, 21 new CastMessageBuilder(clock,
22 max_unacked_frames)) { 22 incoming_payload_feedback,
23 &frame_id_map_,
24 ssrc,
25 decoder_faster_than_max_frame_rate,
26 max_unacked_frames)) {
23 DCHECK(incoming_payload_feedback) << "Invalid argument"; 27 DCHECK(incoming_payload_feedback) << "Invalid argument";
24 } 28 }
25 29
26 Framer::~Framer() {} 30 Framer::~Framer() {}
27 31
28 bool Framer::InsertPacket(const uint8* payload_data, 32 bool Framer::InsertPacket(const uint8* payload_data,
29 size_t payload_size, 33 size_t payload_size,
30 const RtpCastHeader& rtp_header, 34 const RtpCastHeader& rtp_header,
31 bool* duplicate) { 35 bool* duplicate) {
32 *duplicate = false; 36 *duplicate = false;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 *next_frame = true; 79 *next_frame = true;
76 } else { 80 } else {
77 if (!frame_id_map_.NextAudioFrameAllowingMissingFrames(&frame_id)) { 81 if (!frame_id_map_.NextAudioFrameAllowingMissingFrames(&frame_id)) {
78 return false; 82 return false;
79 } 83 }
80 *next_frame = false; 84 *next_frame = false;
81 } 85 }
82 86
83 ConstFrameIterator it = frames_.find(frame_id); 87 ConstFrameIterator it = frames_.find(frame_id);
84 DCHECK(it != frames_.end()); 88 DCHECK(it != frames_.end());
85 if (it == frames_.end()) return false; 89 if (it == frames_.end())
90 return false;
86 91
87 return it->second->GetEncodedAudioFrame(audio_frame, rtp_timestamp); 92 return it->second->GetEncodedAudioFrame(audio_frame, rtp_timestamp);
88 } 93 }
89 94
90 // This does not release the frame. 95 // This does not release the frame.
91 bool Framer::GetEncodedVideoFrame(transport::EncodedVideoFrame* video_frame, 96 bool Framer::GetEncodedVideoFrame(transport::EncodedVideoFrame* video_frame,
92 uint32* rtp_timestamp, 97 uint32* rtp_timestamp,
93 bool* next_frame) { 98 bool* next_frame) {
94 uint32 frame_id; 99 uint32 frame_id;
95 // Find frame id. 100 // Find frame id.
96 if (frame_id_map_.NextContinuousFrame(&frame_id)) { 101 if (frame_id_map_.NextContinuousFrame(&frame_id)) {
97 // We have our next frame. 102 // We have our next frame.
98 *next_frame = true; 103 *next_frame = true;
99 } else { 104 } else {
100 // Check if we can skip frames when our decoder is too slow. 105 // Check if we can skip frames when our decoder is too slow.
101 if (!decoder_faster_than_max_frame_rate_) return false; 106 if (!decoder_faster_than_max_frame_rate_)
107 return false;
102 108
103 if (!frame_id_map_.NextVideoFrameAllowingSkippingFrames(&frame_id)) { 109 if (!frame_id_map_.NextVideoFrameAllowingSkippingFrames(&frame_id)) {
104 return false; 110 return false;
105 } 111 }
106 *next_frame = false; 112 *next_frame = false;
107 } 113 }
108 114
109 ConstFrameIterator it = frames_.find(frame_id); 115 ConstFrameIterator it = frames_.find(frame_id);
110 DCHECK(it != frames_.end()); 116 DCHECK(it != frames_.end());
111 if (it == frames_.end()) return false; 117 if (it == frames_.end())
118 return false;
112 119
113 return it->second->GetEncodedVideoFrame(video_frame, rtp_timestamp); 120 return it->second->GetEncodedVideoFrame(video_frame, rtp_timestamp);
114 } 121 }
115 122
116 void Framer::Reset() { 123 void Framer::Reset() {
117 frame_id_map_.Clear(); 124 frame_id_map_.Clear();
118 frames_.clear(); 125 frames_.clear();
119 cast_msg_builder_->Reset(); 126 cast_msg_builder_->Reset();
120 } 127 }
121 128
122 void Framer::ReleaseFrame(uint32 frame_id) { 129 void Framer::ReleaseFrame(uint32 frame_id) {
123 frame_id_map_.RemoveOldFrames(frame_id); 130 frame_id_map_.RemoveOldFrames(frame_id);
124 frames_.erase(frame_id); 131 frames_.erase(frame_id);
125 132
126 // We have a frame - remove all frames with lower frame id. 133 // We have a frame - remove all frames with lower frame id.
127 bool skipped_old_frame = false; 134 bool skipped_old_frame = false;
128 FrameList::iterator it; 135 FrameList::iterator it;
129 for (it = frames_.begin(); it != frames_.end(); ) { 136 for (it = frames_.begin(); it != frames_.end();) {
130 if (IsOlderFrameId(it->first, frame_id)) { 137 if (IsOlderFrameId(it->first, frame_id)) {
131 frames_.erase(it++); 138 frames_.erase(it++);
132 skipped_old_frame = true; 139 skipped_old_frame = true;
133 } else { 140 } else {
134 ++it; 141 ++it;
135 } 142 }
136 } 143 }
137 if (skipped_old_frame) { 144 if (skipped_old_frame) {
138 cast_msg_builder_->UpdateCastMessage(); 145 cast_msg_builder_->UpdateCastMessage();
139 } 146 }
140 } 147 }
141 148
142 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) { 149 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) {
143 return cast_msg_builder_->TimeToSendNextCastMessage(time_to_send); 150 return cast_msg_builder_->TimeToSendNextCastMessage(time_to_send);
144 } 151 }
145 152
146 void Framer::SendCastMessage() { 153 void Framer::SendCastMessage() { cast_msg_builder_->UpdateCastMessage(); }
147 cast_msg_builder_->UpdateCastMessage();
148 }
149 154
150 } // namespace cast 155 } // namespace cast
151 } // namespace media 156 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/framer/frame_id_map.cc ('k') | media/cast/framer/framer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698