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: remoting/protocol/webrtc_video_encoder_factory.cc

Issue 2079253003: Move frame scheduling logic from WebrtcFrameScheduler to WebrtcVideoStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 6 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 | « remoting/protocol/webrtc_frame_scheduler.cc ('k') | remoting/protocol/webrtc_video_stream.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "remoting/protocol/webrtc_video_encoder_factory.h" 5 #include "remoting/protocol/webrtc_video_encoder_factory.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 } 214 }
215 215
216 void WebrtcVideoEncoderFactory::SetKeyFrameRequestCallback( 216 void WebrtcVideoEncoderFactory::SetKeyFrameRequestCallback(
217 const base::Closure& key_frame_request) { 217 const base::Closure& key_frame_request) {
218 base::AutoLock lock(lock_); 218 base::AutoLock lock(lock_);
219 key_frame_request_ = key_frame_request; 219 key_frame_request_ = key_frame_request;
220 if (encoders_.size() == 1) { 220 if (encoders_.size() == 1) {
221 encoders_.front()->SetKeyFrameRequestCallback(key_frame_request); 221 encoders_.front()->SetKeyFrameRequestCallback(key_frame_request);
222 } else { 222 } else {
223 LOG(ERROR) << "Dropping key frame request callback with unexpected" 223 LOG(ERROR) << "Dropping key frame request callback with unexpected"
224 " number of encoders" 224 " number of encoders: "
225 << encoders_.size(); 225 << encoders_.size();
226 } 226 }
227 } 227 }
228 228
229 void WebrtcVideoEncoderFactory::SetTargetBitrateCallback( 229 void WebrtcVideoEncoderFactory::SetTargetBitrateCallback(
230 const TargetBitrateCallback& target_bitrate_cb) { 230 const TargetBitrateCallback& target_bitrate_cb) {
231 base::AutoLock lock(lock_); 231 base::AutoLock lock(lock_);
232 target_bitrate_cb_ = target_bitrate_cb; 232 target_bitrate_cb_ = target_bitrate_cb;
233 if (encoders_.size() == 1) { 233 if (encoders_.size() == 1) {
234 encoders_.front()->SetTargetBitrateCallback(target_bitrate_cb); 234 encoders_.front()->SetTargetBitrateCallback(target_bitrate_cb);
235 } else { 235 } else {
236 LOG(ERROR) << "Dropping target bitrate request callback with unexpected" 236 LOG(ERROR) << "Dropping target bitrate request callback with unexpected"
237 " number of encoders" 237 " number of encoders: "
238 << encoders_.size(); 238 << encoders_.size();
239 } 239 }
240 } 240 }
241 } // namespace remoting 241 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/webrtc_frame_scheduler.cc ('k') | remoting/protocol/webrtc_video_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698