| Index: content/browser/media/capture/content_video_capture_device_core.h
|
| diff --git a/content/browser/media/capture/content_video_capture_device_core.h b/content/browser/media/capture/content_video_capture_device_core.h
|
| index f477a157439a33aa845cc0758008cc099a49163b..cc545102b1765d6ec793ec1f5e0cee70e69b93a7 100644
|
| --- a/content/browser/media/capture/content_video_capture_device_core.h
|
| +++ b/content/browser/media/capture/content_video_capture_device_core.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread.h"
|
| #include "base/threading/thread_checker.h"
|
| +#include "content/browser/media/capture/capture_resolution_evaluator.h"
|
| #include "content/browser/media/capture/video_capture_oracle.h"
|
| #include "content/common/content_export.h"
|
| #include "media/base/video_frame.h"
|
| @@ -23,15 +24,6 @@ class VideoFrame;
|
|
|
| namespace content {
|
|
|
| -const int kMinFrameWidth = 2;
|
| -const int kMinFrameHeight = 2;
|
| -
|
| -// Returns the nearest even integer closer to zero.
|
| -template<typename IntType>
|
| -IntType MakeEven(IntType x) {
|
| - return x & static_cast<IntType>(-2);
|
| -}
|
| -
|
| class VideoCaptureMachine;
|
|
|
| // Thread-safe, refcounted proxy to the VideoCaptureOracle. This proxy wraps
|
| @@ -104,8 +96,8 @@ class ThreadSafeCaptureOracle
|
| // The video capture parameters used to construct the oracle proxy.
|
| const media::VideoCaptureParams params_;
|
|
|
| - // The current video capture size.
|
| - gfx::Size capture_size_;
|
| + // Determines video capture frame sizes.
|
| + CaptureResolutionEvaluator resolution_evaluator_;
|
| };
|
|
|
| // Keeps track of the video capture source frames and executes copying on the
|
|
|