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

media/capture/screen_capture_device_core.cc

 // Copyright 2014 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/screen_capture_device_core.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 23 matching lines @@
   }
 
   if (params.requested_format.frame_rate <= 0) {
     std::string error_msg("Invalid frame_rate: ");
     error_msg += base::DoubleToString(params.requested_format.frame_rate);
     DVLOG(1) << error_msg;
     client->OnError(error_msg);
     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);
     return;
   }
 
   oracle_proxy_ = new ThreadSafeCaptureOracle(client.Pass(), params);
 
   capture_machine_->Start(
       oracle_proxy_,
@@ skipping 64 matching lines @@
     return;
 
   if (oracle_proxy_.get())
     oracle_proxy_->ReportError(reason);
 
   StopAndDeAllocate();
   TransitionStateTo(kError);
 }
 
 }  // namespace media