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

Side by Side Diff: webrtc/video/vie_encoder.cc

Issue 1756093003: Fix last commit error successfully. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 video_codec.numberOfSimulcastStreams); 233 video_codec.numberOfSimulcastStreams);
234 234
235 // Restart the media flow 235 // Restart the media flow
236 Restart(); 236 Restart();
237 if (stats_proxy_) { 237 if (stats_proxy_) {
238 // Clear stats for disabled layers. 238 // Clear stats for disabled layers.
239 for (size_t i = video_codec.numberOfSimulcastStreams; i < ssrcs_.size(); 239 for (size_t i = video_codec.numberOfSimulcastStreams; i < ssrcs_.size();
240 ++i) { 240 ++i) {
241 stats_proxy_->OnInactiveSsrc(ssrcs_[i]); 241 stats_proxy_->OnInactiveSsrc(ssrcs_[i]);
242 } 242 }
243 VideoEncoderConfig::ContentType content_type = kRealtimeVideo; 243 VideoEncoderConfig::ContentType content_type =
244 VideoEncoderConfig::ContentType::kRealtimeVideo;
244 switch (video_codec.mode) { 245 switch (video_codec.mode) {
245 case kRealtimeVideo: 246 case kRealtimeVideo:
246 content_type = VideoEncoderConfig::ContentType::kRealtimeVideo; 247 content_type = VideoEncoderConfig::ContentType::kRealtimeVideo;
247 break; 248 break;
248 case kScreensharing: 249 case kScreensharing:
249 content_type = VideoEncoderConfig::ContentType::kScreen; 250 content_type = VideoEncoderConfig::ContentType::kScreen;
250 break; 251 break;
251 default: 252 default:
252 RTC_NOTREACHED(); 253 RTC_NOTREACHED();
253 break; 254 break;
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 const uint32_t width, 568 const uint32_t width,
568 const uint32_t height) { 569 const uint32_t height) {
569 return vp_->SetTargetResolution(width, height, frame_rate); 570 return vp_->SetTargetResolution(width, height, frame_rate);
570 } 571 }
571 572
572 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) { 573 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) {
573 vp_->SetTargetFramerate(frame_rate); 574 vp_->SetTargetFramerate(frame_rate);
574 } 575 }
575 576
576 } // namespace webrtc 577 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698