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

Side by Side Diff: content/renderer/pepper/pepper_video_capture_host.cc

Issue 541163002: Clarify resolution change behaviors of video capture devices (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/pepper/pepper_video_capture_host.h" 5 #include "content/renderer/pepper/pepper_video_capture_host.h"
6 6
7 #include "content/renderer/pepper/host_globals.h" 7 #include "content/renderer/pepper/host_globals.h"
8 #include "content/renderer/pepper/pepper_media_device_manager.h" 8 #include "content/renderer/pepper/pepper_media_device_manager.h"
9 #include "content/renderer/pepper/pepper_platform_video_capture.h" 9 #include "content/renderer/pepper/pepper_platform_video_capture.h"
10 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 10 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 buffer_count_hint_ = std::min(std::max(buffer_count, 1U), kMaxBuffers); 350 buffer_count_hint_ = std::min(std::max(buffer_count, 1U), kMaxBuffers);
351 // Clamp the frame rate to between 1 and |kMaxFramesPerSecond - 1|. 351 // Clamp the frame rate to between 1 and |kMaxFramesPerSecond - 1|.
352 int frames_per_second = 352 int frames_per_second =
353 std::min(std::max(device_info.frames_per_second, 1U), 353 std::min(std::max(device_info.frames_per_second, 1U),
354 static_cast<uint32_t>(media::limits::kMaxFramesPerSecond - 1)); 354 static_cast<uint32_t>(media::limits::kMaxFramesPerSecond - 1));
355 355
356 video_capture_params_.requested_format = media::VideoCaptureFormat( 356 video_capture_params_.requested_format = media::VideoCaptureFormat(
357 gfx::Size(device_info.width, device_info.height), 357 gfx::Size(device_info.width, device_info.height),
358 frames_per_second, 358 frames_per_second,
359 media::PIXEL_FORMAT_I420); 359 media::PIXEL_FORMAT_I420);
360 video_capture_params_.allow_resolution_change = false;
361 } 360 }
362 361
363 void PepperVideoCaptureHost::DetachPlatformVideoCapture() { 362 void PepperVideoCaptureHost::DetachPlatformVideoCapture() {
364 if (platform_video_capture_) { 363 if (platform_video_capture_) {
365 platform_video_capture_->DetachEventHandler(); 364 platform_video_capture_->DetachEventHandler();
366 platform_video_capture_.reset(); 365 platform_video_capture_.reset();
367 } 366 }
368 } 367 }
369 368
370 bool PepperVideoCaptureHost::SetStatus(PP_VideoCaptureStatus_Dev status, 369 bool PepperVideoCaptureHost::SetStatus(PP_VideoCaptureStatus_Dev status,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 414 }
416 415
417 PepperVideoCaptureHost::BufferInfo::BufferInfo() 416 PepperVideoCaptureHost::BufferInfo::BufferInfo()
418 : in_use(false), data(NULL), buffer() { 417 : in_use(false), data(NULL), buffer() {
419 } 418 }
420 419
421 PepperVideoCaptureHost::BufferInfo::~BufferInfo() { 420 PepperVideoCaptureHost::BufferInfo::~BufferInfo() {
422 } 421 }
423 422
424 } // namespace content 423 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/video_capture_impl.cc ('k') | media/video/capture/fake_video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698