Index: content/browser/renderer_host/media/video_capture_device_client.cc |
diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc |
index ade0d742042db9d221d57caaa4e600b193379b29..b6225bdbcbb1041017e77609d01aa5f0b06510fc 100644 |
--- a/content/browser/renderer_host/media/video_capture_device_client.cc |
+++ b/content/browser/renderer_host/media/video_capture_device_client.cc |
@@ -121,7 +121,8 @@ class AutoReleaseBuffer : public media::VideoCaptureDevice::Client::Buffer { |
DCHECK(pool_.get()); |
} |
int id() const override { return id_; } |
- size_t size() const override { return buffer_handle_->size(); } |
+ gfx::Size dimensions() const override { return buffer_handle_->dimensions(); } |
+ size_t mapped_size() const override { return buffer_handle_->mapped_size(); } |
void* data(int plane) override { return buffer_handle_->data(plane); } |
ClientBuffer AsClientBuffer(int plane) override { |
return buffer_handle_->AsClientBuffer(plane); |
@@ -354,7 +355,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( |
// The input |length| can be greater than the required buffer size because of |
// paddings and/or alignments, but it cannot be smaller. |
- DCHECK_GE(static_cast<size_t>(length), frame_format.ImageAllocationSize()); |
+// DCHECK_GE(static_cast<size_t>(length), frame_format.ImageAllocationSize()); |
reveman
2015/08/26 11:54:04
why comment this out?
emircan
2015/08/26 21:23:11
My bad, leftover from crbug.com/520740.
|
if (external_jpeg_decoder_) { |
const VideoCaptureGpuJpegDecoder::STATUS status = |