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

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

Issue 339743002: Cast: Make vp8 3-buffer mode work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged, comment updated Created 6 years, 3 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
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/framer.h" 5 #include "media/cast/net/rtp/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 {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // Check if we can skip frames when our decoder is too slow. 76 // Check if we can skip frames when our decoder is too slow.
77 if (!decoder_faster_than_max_frame_rate_) 77 if (!decoder_faster_than_max_frame_rate_)
78 return false; 78 return false;
79 79
80 if (!frame_id_map_.NextFrameAllowingSkippingFrames(&frame_id)) { 80 if (!frame_id_map_.NextFrameAllowingSkippingFrames(&frame_id)) {
81 return false; 81 return false;
82 } 82 }
83 *next_frame = false; 83 *next_frame = false;
84 } 84 }
85 85
86 if (*next_frame) {
87 VLOG(2) << "ACK frame " << frame_id;
88 cast_msg_builder_->CompleteFrameReceived(frame_id);
89 }
90
91 ConstFrameIterator it = frames_.find(frame_id); 86 ConstFrameIterator it = frames_.find(frame_id);
92 DCHECK(it != frames_.end()); 87 DCHECK(it != frames_.end());
93 if (it == frames_.end()) 88 if (it == frames_.end())
94 return false; 89 return false;
95 90
96 return it->second->AssembleEncodedFrame(frame); 91 return it->second->AssembleEncodedFrame(frame);
97 } 92 }
98 93
94 void Framer::AckFrame(uint32 frame_id) {
95 VLOG(2) << "ACK frame " << frame_id;
96 cast_msg_builder_->CompleteFrameReceived(frame_id);
97 }
98
99 void Framer::Reset() { 99 void Framer::Reset() {
100 frame_id_map_.Clear(); 100 frame_id_map_.Clear();
101 frames_.clear(); 101 frames_.clear();
102 cast_msg_builder_->Reset(); 102 cast_msg_builder_->Reset();
103 } 103 }
104 104
105 void Framer::ReleaseFrame(uint32 frame_id) { 105 void Framer::ReleaseFrame(uint32 frame_id) {
106 frame_id_map_.RemoveOldFrames(frame_id); 106 frame_id_map_.RemoveOldFrames(frame_id);
107 frames_.erase(frame_id); 107 frames_.erase(frame_id);
108 108
(...skipping 14 matching lines...) Expand all
123 } 123 }
124 124
125 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) { 125 bool Framer::TimeToSendNextCastMessage(base::TimeTicks* time_to_send) {
126 return cast_msg_builder_->TimeToSendNextCastMessage(time_to_send); 126 return cast_msg_builder_->TimeToSendNextCastMessage(time_to_send);
127 } 127 }
128 128
129 void Framer::SendCastMessage() { cast_msg_builder_->UpdateCastMessage(); } 129 void Framer::SendCastMessage() { cast_msg_builder_->UpdateCastMessage(); }
130 130
131 } // namespace cast 131 } // namespace cast
132 } // namespace media 132 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698