diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 07:14:36 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 07:14:36 +0000 |
| commit | ea36635c7a2d7dd3517b25081f0a9e31bfe92a19 (patch) | |
| tree | 596771a7ed3b8a2380cda28b69eaff145a901bd8 /content | |
| parent | 199263ee614a079d14f5114866ab0f99dde7c111 (diff) | |
| download | chromium_src-ea36635c7a2d7dd3517b25081f0a9e31bfe92a19.zip chromium_src-ea36635c7a2d7dd3517b25081f0a9e31bfe92a19.tar.gz chromium_src-ea36635c7a2d7dd3517b25081f0a9e31bfe92a19.tar.bz2 | |
Remove resolution hack for TabCapture implementation
Resolution can be set through MediaConstraints so remove the resolution hack.
BUG=163286
Review URL: https://chromiumcodereview.appspot.com/11565025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/media/web_contents_video_capture_device.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc index d9b8b7f..bdedbb2 100644 --- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc +++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc @@ -69,11 +69,6 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/rect.h" -// TODO(miu): The caller of Allocate() should use an appropriate heuristic to -// determine the frame size. For now, hard-code the capture device to 720p -// resolution. -#define FORCE_1280x720_FRAME_SIZE - // Used to self-trampoline invocation of methods to the approprate thread. This // should be used sparingly, only when it's not clear which thread is invoking a // method. @@ -740,13 +735,6 @@ void CaptureMachine::Allocate(int width, int height, int frame_rate) { return; } -#ifdef FORCE_1280x720_FRAME_SIZE - VLOG_IF(1, width != 1280 || height != 720) - << "Forced frame size to 1280x720."; - width = 1280; - height = 720; -#endif - // Frame dimensions must each be a positive, even integer, since the consumer // wants (or will convert to) YUV420. width = MakeEven(width); |