Reland:Refactored pixel format resize operations in media/video/capture into a function called Vide…

media/video/capture/file_video_capture_device.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 "media/video/capture/file_video_capture_device.h"
 
 #include <string>
 
 #include "base/bind.h"
 #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;
 static const char kY4MSimpleFrameDelimiter[] = "FRAME";
 static const int kY4MSimpleFrameDelimiterSize = 6;
 
 int ParseY4MInt(const base::StringPiece& token) {
   int temp_int;
   CHECK(base::StringToInt(token, &temp_int)) << token;
   return temp_int;
@@ skipping 139 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   CHECK(capture_thread_.IsRunning());
 
   capture_thread_.message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&FileVideoCaptureDevice::OnStopAndDeAllocate,
                  base::Unretained(this)));
   capture_thread_.Stop();
 }
 
-int FileVideoCaptureDevice::CalculateFrameSize() {
+int FileVideoCaptureDevice::CalculateFrameSize() const {
   DCHECK_EQ(capture_format_.pixel_format, PIXEL_FORMAT_I420);
   DCHECK_EQ(capture_thread_.message_loop(), base::MessageLoop::current());
-  return capture_format_.frame_size.GetArea() * 12 / 8;
+  return capture_format_.ImageAllocationSize();
 }
 
 void FileVideoCaptureDevice::OnAllocateAndStart(
     const VideoCaptureParams& params,
     scoped_ptr<VideoCaptureDevice::Client> client) {
   DCHECK_EQ(capture_thread_.message_loop(), base::MessageLoop::current());
 
   client_ = client.Pass();
 
   // Open the file and parse the header. Get frame size and format.
@@ skipping 62 matching lines @@
     next_on_capture_timedelta = frame_interval;
   }
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&FileVideoCaptureDevice::OnCaptureTask,
                  base::Unretained(this)),
       next_on_capture_timedelta);
 }
 
 }  // namespace media