Video capture frame size: separate coded size and visible size.

content/browser/media/capture/desktop_capture_device_aura.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/capture/desktop_capture_device_aura.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/timer/timer.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 236 matching lines @@
   timer_.Stop();
 
   started_ = false;
 
   callback.Run();
 }
 
 void DesktopVideoCaptureMachine::UpdateCaptureSize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (oracle_proxy_.get() && desktop_window_) {
-    ui::Layer* layer = desktop_window_->layer();
-    gfx::Size capture_size =
-        ui::ConvertSizeToPixel(layer, layer->bounds().size());
-#if defined(OS_CHROMEOS)
-    // Pad desktop capture size to multiples of 16 pixels to accommodate HW
-    // encoder. TODO(hshi): remove this hack. See http://crbug.com/402151
-    capture_size.SetSize((capture_size.width() + 15) & ~15,
-                         (capture_size.height() + 15) & ~15);
-#endif
-    oracle_proxy_->UpdateCaptureSize(capture_size);
+     ui::Layer* layer = desktop_window_->layer();
+     oracle_proxy_->UpdateCaptureSize(ui::ConvertSizeToPixel(
+         layer, layer->bounds().size()));
   }
   ClearCursorState();
 }
 
 void DesktopVideoCaptureMachine::Capture(bool dirty) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Do not capture if the desktop window is already destroyed.
   if (!desktop_window_)
     return;
@@ skipping 262 matching lines @@
     scoped_ptr<Client> client) {
   DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
   core_->AllocateAndStart(params, client.Pass());
 }
 
 void DesktopCaptureDeviceAura::StopAndDeAllocate() {
   core_->StopAndDeAllocate();
 }
 
 }  // namespace content