| Index: media/video/capture/file_video_capture_device.cc
|
| diff --git a/media/video/capture/file_video_capture_device.cc b/media/video/capture/file_video_capture_device.cc
|
| index 46f89b5da3353e5f30fc8609fdbb8cb5a5fda122..24673aa45934d824faba863e65c650c925587f19 100644
|
| --- a/media/video/capture/file_video_capture_device.cc
|
| +++ b/media/video/capture/file_video_capture_device.cc
|
| @@ -10,7 +10,6 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_piece.h"
|
| -#include "media/video/capture/video_capture_types.h"
|
|
|
| namespace media {
|
| static const int kY4MHeaderMaxSize = 200;
|
| @@ -170,10 +169,10 @@
|
| capture_thread_.Stop();
|
| }
|
|
|
| -int FileVideoCaptureDevice::CalculateFrameSize() const {
|
| +int FileVideoCaptureDevice::CalculateFrameSize() {
|
| DCHECK_EQ(capture_format_.pixel_format, PIXEL_FORMAT_I420);
|
| DCHECK_EQ(capture_thread_.message_loop(), base::MessageLoop::current());
|
| - return capture_format_.ImageAllocationSize();
|
| + return capture_format_.frame_size.GetArea() * 12 / 8;
|
| }
|
|
|
| void FileVideoCaptureDevice::OnAllocateAndStart(
|
|
|