Refactored pixel format resize operations in media/video/capture into a function called VideoCaptu…

media/video/capture/win/sink_input_pin_win.cc

Index: media/video/capture/win/sink_input_pin_win.cc
diff --git a/media/video/capture/win/sink_input_pin_win.cc b/media/video/capture/win/sink_input_pin_win.cc
index bf2a247a8381150a7117e03986277261f5773c32..1ff34478a7d71ca1ef109afd2ae4c4874c432f06 100644
--- a/media/video/capture/win/sink_input_pin_win.cc
+++ b/media/video/capture/win/sink_input_pin_win.cc
@@ -52,7 +52,7 @@ bool SinkInputPin::GetValidMediaType(int index, AM_MEDIA_TYPE* media_type) {
       pvi->bmiHeader.biWidth = requested_format_.frame_size.width();
       pvi->bmiHeader.biHeight = requested_format_.frame_size.height();
       pvi->bmiHeader.biSizeImage =
-          requested_format_.frame_size.GetArea() * 3 / 2;
+          requested_format_.ImageAllocationSize();

[mcasas, 2015/02/03 20:48:46]

Doesn't this fit in one line? Same for the other changed lines
below.

       media_type->subtype = kMediaSubTypeI420;
       break;
     }
@@ -61,7 +61,8 @@ bool SinkInputPin::GetValidMediaType(int index, AM_MEDIA_TYPE* media_type) {
       pvi->bmiHeader.biBitCount = 16;
       pvi->bmiHeader.biWidth = requested_format_.frame_size.width();
       pvi->bmiHeader.biHeight = requested_format_.frame_size.height();
-      pvi->bmiHeader.biSizeImage = requested_format_.frame_size.GetArea() * 2;
+      pvi->bmiHeader.biSizeImage =
+          requested_format_.ImageAllocationSize();
       media_type->subtype = MEDIASUBTYPE_YUY2;
       break;
     }
@@ -70,7 +71,8 @@ bool SinkInputPin::GetValidMediaType(int index, AM_MEDIA_TYPE* media_type) {
       pvi->bmiHeader.biBitCount = 0;
       pvi->bmiHeader.biWidth = requested_format_.frame_size.width();
       pvi->bmiHeader.biHeight = requested_format_.frame_size.height();
-      pvi->bmiHeader.biSizeImage = 0;
+      pvi->bmiHeader.biSizeImage =
+          requested_format_.ImageAllocationSize();
       media_type->subtype = MEDIASUBTYPE_MJPG;
       break;
     }
@@ -79,7 +81,8 @@ bool SinkInputPin::GetValidMediaType(int index, AM_MEDIA_TYPE* media_type) {
       pvi->bmiHeader.biBitCount = 24;
       pvi->bmiHeader.biWidth = requested_format_.frame_size.width();
       pvi->bmiHeader.biHeight = requested_format_.frame_size.height();
-      pvi->bmiHeader.biSizeImage = requested_format_.frame_size.GetArea() * 3;
+      pvi->bmiHeader.biSizeImage =
+          requested_format_.ImageAllocationSize();
       media_type->subtype = MEDIASUBTYPE_RGB24;
       break;
     }