Reland: Video Capture: extract storage info from pixel format in VideoCaptureFormat.

media/capture/screen_capture_device_core.cc

Index: media/capture/screen_capture_device_core.cc
diff --git a/media/capture/screen_capture_device_core.cc b/media/capture/screen_capture_device_core.cc
index a8993e7ef897b64691500c27b04eedcfbf7d2293..3705eadab1338eb332550c27e892d5001df1bbaf 100644
--- a/media/capture/screen_capture_device_core.cc
+++ b/media/capture/screen_capture_device_core.cc
@@ -41,17 +41,19 @@ void ScreenCaptureDeviceCore::AllocateAndStart(
     return;
   }
 
-  if (params.requested_format.pixel_format != PIXEL_FORMAT_I420 &&
-      params.requested_format.pixel_format != PIXEL_FORMAT_TEXTURE) {
-    std::string error_msg = base::StringPrintf(
-        "unsupported format: %d", params.requested_format.pixel_format);
+  if (!(params.requested_format.pixel_format == PIXEL_FORMAT_I420 &&
+        params.requested_format.pixel_storage == PIXEL_STORAGE_CPU) &&
+      !(params.requested_format.pixel_format == PIXEL_FORMAT_ARGB &&
+        params.requested_format.pixel_storage == PIXEL_STORAGE_TEXTURE)) {
+    const std::string error_msg = base::StringPrintf(
+        "unsupported format: %s", params.requested_format.ToString().c_str());
     DVLOG(1) << error_msg;
     client->OnError(error_msg);
     return;
   }
 
   if (params.requested_format.frame_size.IsEmpty()) {
-    std::string error_msg =
+    const std::string error_msg =
         "invalid frame size: " + params.requested_format.frame_size.ToString();
     DVLOG(1) << error_msg;
     client->OnError(error_msg);