Revert of Win Video Capture: add UYVY pixel format to Cr sink filter pin capabilities

media/capture/video/win/sink_input_pin_win.cc

 // Copyright (c) 2012 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/capture/video/win/sink_input_pin_win.h"
 
 #include <cstring>
 
 // Avoid including strsafe.h via dshow as it will cause build warnings.
 #define NO_DSHOW_STRSAFE
@@ skipping 18 matching lines @@
     float frame_rate,
     const BITMAPINFOHEADER& info_header) {
   requested_pixel_format_ = pixel_format;
   requested_frame_rate_ = frame_rate;
   requested_info_header_ = info_header;
   resulting_format_.frame_size.SetSize(0, 0);
   resulting_format_.frame_rate = 0;
   resulting_format_.pixel_format = PIXEL_FORMAT_UNKNOWN;
 }
 
+const VideoCaptureFormat& SinkInputPin::ResultingFormat() {
+  return resulting_format_;
+}
+
 bool SinkInputPin::IsMediaTypeValid(const AM_MEDIA_TYPE* media_type) {
-  const GUID type = media_type->majortype;
+  GUID type = media_type->majortype;
   if (type != MEDIATYPE_Video)
     return false;
 
-  const GUID format_type = media_type->formattype;
+  GUID format_type = media_type->formattype;
   if (format_type != FORMAT_VideoInfo)
     return false;
 
   // Check for the sub types we support.
-  const GUID sub_type = media_type->subtype;
+  GUID sub_type = media_type->subtype;
   VIDEOINFOHEADER* pvi =
       reinterpret_cast<VIDEOINFOHEADER*>(media_type->pbFormat);
   if (pvi == NULL)
     return false;
 
   // Store the incoming width and height.
   resulting_format_.frame_size.SetSize(pvi->bmiHeader.biWidth,
                                        abs(pvi->bmiHeader.biHeight));
   if (pvi->AvgTimePerFrame > 0) {
     resulting_format_.frame_rate =
         static_cast<int>(kSecondsToReferenceTime / pvi->AvgTimePerFrame);
   } else {
     resulting_format_.frame_rate = requested_frame_rate_;
   }
   if (sub_type == kMediaSubTypeI420 &&
       pvi->bmiHeader.biCompression == MAKEFOURCC('I', '4', '2', '0')) {
     resulting_format_.pixel_format = PIXEL_FORMAT_I420;
     return true;
   }
   if (sub_type == MEDIASUBTYPE_YUY2 &&
       pvi->bmiHeader.biCompression == MAKEFOURCC('Y', 'U', 'Y', '2')) {
     resulting_format_.pixel_format = PIXEL_FORMAT_YUY2;
     return true;
   }
-  // This format is added after http:/crbug.com/508413.
-  if (sub_type == MEDIASUBTYPE_UYVY &&
-      pvi->bmiHeader.biCompression == MAKEFOURCC('U', 'Y', 'V', 'Y')) {
-    resulting_format_.pixel_format = PIXEL_FORMAT_UYVY;
-    return true;
-  }
   if (sub_type == MEDIASUBTYPE_MJPG &&
       pvi->bmiHeader.biCompression == MAKEFOURCC('M', 'J', 'P', 'G')) {
     resulting_format_.pixel_format = PIXEL_FORMAT_MJPEG;
     return true;
   }
   if (sub_type == MEDIASUBTYPE_RGB24 &&
       pvi->bmiHeader.biCompression == BI_RGB) {
     resulting_format_.pixel_format = PIXEL_FORMAT_RGB24;
     return true;
   }
   if (sub_type == MEDIASUBTYPE_RGB32 &&
       pvi->bmiHeader.biCompression == BI_RGB) {
     resulting_format_.pixel_format = PIXEL_FORMAT_RGB32;
     return true;
   }
-
-#ifndef NDEBUG
-  WCHAR guid_str[128];
-  StringFromGUID2(sub_type, guid_str, arraysize(guid_str));
-  DVLOG(2) << __FUNCTION__ << " unsupported media type: " << guid_str;
-#endif
   return false;
 }
 
 bool SinkInputPin::GetValidMediaType(int index, AM_MEDIA_TYPE* media_type) {
   if (media_type->cbFormat < sizeof(VIDEOINFOHEADER))
     return false;
 
-  VIDEOINFOHEADER* const pvi =
+  VIDEOINFOHEADER* pvi =
       reinterpret_cast<VIDEOINFOHEADER*>(media_type->pbFormat);
 
   ZeroMemory(pvi, sizeof(VIDEOINFOHEADER));
   pvi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
   pvi->bmiHeader.biPlanes = 1;
   pvi->bmiHeader.biClrImportant = 0;
   pvi->bmiHeader.biClrUsed = 0;
-  if (requested_frame_rate_ > 0)
+  if (requested_frame_rate_ > 0) {
     pvi->AvgTimePerFrame = kSecondsToReferenceTime / requested_frame_rate_;
+  }
 
   media_type->majortype = MEDIATYPE_Video;
   media_type->formattype = FORMAT_VideoInfo;
   media_type->bTemporalCompression = FALSE;
 
   if (requested_pixel_format_ == PIXEL_FORMAT_MJPEG) {
     // If the requested pixel format is MJPEG, accept only MJPEG.
     // This is ok since the capabilities of the capturer have been
     // enumerated and we know that it is supported.
     if (index != 0)
@@ skipping 16 matching lines @@
     case 1: {
       pvi->bmiHeader.biCompression = MAKEFOURCC('Y', 'U', 'Y', '2');
       pvi->bmiHeader.biBitCount = 16;
       pvi->bmiHeader.biWidth = requested_info_header_.biWidth;
       pvi->bmiHeader.biHeight = requested_info_header_.biHeight;
       pvi->bmiHeader.biSizeImage = GetArea(requested_info_header_) * 2;
       media_type->subtype = MEDIASUBTYPE_YUY2;
       break;
     }
     case 2: {
-      pvi->bmiHeader.biCompression = MAKEFOURCC('U', 'Y', 'V', 'Y');
-      pvi->bmiHeader.biBitCount = 16;
-      pvi->bmiHeader.biWidth = requested_info_header_.biWidth;
-      pvi->bmiHeader.biHeight = requested_info_header_.biHeight;
-      pvi->bmiHeader.biSizeImage = GetArea(requested_info_header_) * 2;
-      media_type->subtype = MEDIASUBTYPE_UYVY;
-      break;
-    }
-    case 3: {
       pvi->bmiHeader.biCompression = BI_RGB;
       pvi->bmiHeader.biBitCount = 24;
       pvi->bmiHeader.biWidth = requested_info_header_.biWidth;
       pvi->bmiHeader.biHeight = requested_info_header_.biHeight;
       pvi->bmiHeader.biSizeImage = GetArea(requested_info_header_) * 3;
       media_type->subtype = MEDIASUBTYPE_RGB24;
       break;
     }
-    case 4: {
+    case 3: {
       pvi->bmiHeader.biCompression = BI_RGB;
       pvi->bmiHeader.biBitCount = 32;
       pvi->bmiHeader.biWidth = requested_info_header_.biWidth;
       pvi->bmiHeader.biHeight = requested_info_header_.biHeight;
       pvi->bmiHeader.biSizeImage = GetArea(requested_info_header_) * 4;
       media_type->subtype = MEDIASUBTYPE_RGB32;
       break;
     }
     default:
       return false;
@@ skipping 17 matching lines @@
     return S_FALSE;
 
   observer_->FrameReceived(buffer, length);
   return S_OK;
 }
 
 SinkInputPin::~SinkInputPin() {
 }
 
 }  // namespace media