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

media/base/video_capture_types.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/base/video_capture_types.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "media/base/limits.h"
 
 namespace media {
 
 VideoCaptureFormat::VideoCaptureFormat()
-    : frame_rate(0.0f),
-      pixel_format(PIXEL_FORMAT_UNKNOWN),
-      pixel_storage(PIXEL_STORAGE_CPU) {
-}
+    : frame_rate(0.0f), pixel_format(PIXEL_FORMAT_UNKNOWN) {}
 
 VideoCaptureFormat::VideoCaptureFormat(const gfx::Size& frame_size,
                                        float frame_rate,
                                        VideoPixelFormat pixel_format)
     : frame_size(frame_size),
       frame_rate(frame_rate),
-      pixel_format(pixel_format),
-      pixel_storage(PIXEL_STORAGE_CPU) {}
-
-VideoCaptureFormat::VideoCaptureFormat(const gfx::Size& frame_size,
-                                       float frame_rate,
-                                       VideoPixelFormat pixel_format,
-                                       VideoPixelStorage pixel_storage)
-    : frame_size(frame_size),
-      frame_rate(frame_rate),
-      pixel_format(pixel_format),
-      pixel_storage(pixel_storage) {}
+      pixel_format(pixel_format) {}
 
 bool VideoCaptureFormat::IsValid() const {
   return (frame_size.width() < media::limits::kMaxDimension) &&
          (frame_size.height() < media::limits::kMaxDimension) &&
          (frame_size.GetArea() >= 0) &&
          (frame_size.GetArea() < media::limits::kMaxCanvas) &&
          (frame_rate >= 0.0f) &&
          (frame_rate < media::limits::kMaxFramesPerSecond) &&
-         (pixel_format >= 0) && (pixel_format < PIXEL_FORMAT_MAX) &&
-         (pixel_storage != PIXEL_STORAGE_TEXTURE ||
-          pixel_format == PIXEL_FORMAT_ARGB);
+         (pixel_format >= 0) &&
+         (pixel_format < PIXEL_FORMAT_MAX);
 }
 
 size_t VideoCaptureFormat::ImageAllocationSize() const {
   size_t result_frame_size = frame_size.GetArea();
   switch (pixel_format) {
     case PIXEL_FORMAT_I420:
     case PIXEL_FORMAT_YV12:
     case PIXEL_FORMAT_NV12:
     case PIXEL_FORMAT_NV21:
       result_frame_size = result_frame_size * 3 / 2;
       break;
     case PIXEL_FORMAT_UYVY:
     case PIXEL_FORMAT_YUY2:
       result_frame_size *= 2;
       break;
     case PIXEL_FORMAT_RGB24:
       result_frame_size *= 3;
       break;
     case PIXEL_FORMAT_RGB32:
     case PIXEL_FORMAT_ARGB:
+    // GpuMemoryBuffer is an endianness-agnostic 32bpp pixel format until
+    // http://crbug.com/439520 is closed.
+    case PIXEL_FORMAT_GPUMEMORYBUFFER:
       result_frame_size *= 4;
       break;
     case PIXEL_FORMAT_MJPEG:
+    case PIXEL_FORMAT_TEXTURE:
       result_frame_size = 0;
       break;
     default:  // Sizes for the rest of the formats are unknown.
       NOTREACHED() << "Unknown pixel format provided.";
       break;
   }
   return result_frame_size;
 }
 
 std::string VideoCaptureFormat::ToString() const {
-  return base::StringPrintf(
-      "(%s)@%.3ffps, pixel format: %s storage: %s.",
-      frame_size.ToString().c_str(), frame_rate,
-      PixelFormatToString(pixel_format).c_str(),
-      PixelStorageToString(pixel_storage).c_str());
+  return base::StringPrintf("resolution: %s, fps: %.3f, pixel format: %s",
+                            frame_size.ToString().c_str(),
+                            frame_rate,
+                            PixelFormatToString(pixel_format).c_str());
 }
 
 std::string VideoCaptureFormat::PixelFormatToString(VideoPixelFormat format) {
   switch (format) {
   case PIXEL_FORMAT_UNKNOWN:
     return "UNKNOWN";
   case PIXEL_FORMAT_I420:
     return "I420";
   case PIXEL_FORMAT_YUY2:
     return "YUY2";
   case PIXEL_FORMAT_UYVY:
     return "UYVY";
   case PIXEL_FORMAT_RGB24:
     return "RGB24";
   case PIXEL_FORMAT_RGB32:
     return "RGB32";
   case PIXEL_FORMAT_ARGB:
     return "ARGB";
   case PIXEL_FORMAT_MJPEG:
     return "MJPEG";
   case PIXEL_FORMAT_NV12:
     return "NV12";
   case PIXEL_FORMAT_NV21:
     return "NV21";
   case PIXEL_FORMAT_YV12:
     return "YV12";
+  case PIXEL_FORMAT_TEXTURE:
+    return "TEXTURE";
+  case PIXEL_FORMAT_GPUMEMORYBUFFER:
+    return "GPUMEMORYBUFFER";
   case PIXEL_FORMAT_MAX:
     break;
   }
   NOTREACHED() << "Invalid VideoPixelFormat provided: " << format;
   return "";
 }
 
-std::string VideoCaptureFormat::PixelStorageToString(
-    VideoPixelStorage storage) {
-  switch (storage) {
-  case PIXEL_STORAGE_CPU:
-    return "CPU";
-  case PIXEL_STORAGE_TEXTURE:
-    return "TEXTURE";
-  case PIXEL_STORAGE_GPUMEMORYBUFFER:
-    return "GPUMEMORYBUFFER";
-  }
-  NOTREACHED() << "Invalid VideoPixelStorage provided: " << storage;
-  return "";
-}
-
 VideoCaptureParams::VideoCaptureParams()
     : resolution_change_policy(RESOLUTION_POLICY_FIXED_RESOLUTION)
 #if defined(OS_LINUX)
       , use_native_gpu_memory_buffers(false)
 #endif
     {}
 
 }  // namespace media