Index: content/browser/media/capture/content_video_capture_device_core.cc |
diff --git a/content/browser/media/capture/content_video_capture_device_core.cc b/content/browser/media/capture/content_video_capture_device_core.cc |
index 5c852d01efe5e6fced23b6f47569db4be591087d..8152b3dbe0e9cc19636190fff20137c9555ec88f 100644 |
--- a/content/browser/media/capture/content_video_capture_device_core.cc |
+++ b/content/browser/media/capture/content_video_capture_device_core.cc |
@@ -75,14 +75,9 @@ |
if (!client_) |
return false; // Capture is stopped. |
- // Always round up the coded size to multiples of 16 pixels. |
- // See http://crbug.com/402151. |
- const gfx::Size visible_size = params_.requested_format.frame_size; |
- const gfx::Size coded_size((visible_size.width() + 15) & ~15, |
- (visible_size.height() + 15) & ~15); |
- |
scoped_refptr<media::VideoCaptureDevice::Client::Buffer> output_buffer = |
- client_->ReserveOutputBuffer(video_frame_format_, coded_size); |
+ client_->ReserveOutputBuffer(video_frame_format_, |
+ params_.requested_format.frame_size); |
const bool should_capture = |
oracle_->ObserveEventAndDecideCapture(event, damage_rect, event_time); |
const bool content_is_dirty = |
@@ -128,9 +123,9 @@ |
if (video_frame_format_ != media::VideoFrame::NATIVE_TEXTURE) { |
*storage = media::VideoFrame::WrapExternalPackedMemory( |
video_frame_format_, |
- coded_size, |
- gfx::Rect(visible_size), |
- visible_size, |
+ params_.requested_format.frame_size, |
+ gfx::Rect(params_.requested_format.frame_size), |
+ params_.requested_format.frame_size, |
static_cast<uint8*>(output_buffer->data()), |
output_buffer->size(), |
base::SharedMemory::NULLHandle(), |