Cull unnecessary media::VideoFrame::Formats from the enum.

media/base/video_frame.h

 // 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.
 
 #ifndef MEDIA_BASE_VIDEO_FRAME_H_
 #define MEDIA_BASE_VIDEO_FRAME_H_
 
 #include "base/callback.h"
 #include "base/md5.h"
 #include "media/base/buffers.h"
 
 namespace media {
 
 class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
  public:
   enum {
     kMaxPlanes = 3,
 
     kRGBPlane = 0,
 
     kYPlane = 0,
     kUPlane = 1,
     kVPlane = 2,
   };
 
   // Surface formats roughly based on FOURCC labels, see:
   // http://www.fourcc.org/rgb.php
   // http://www.fourcc.org/yuv.php
   // Keep in sync with WebKit::WebVideoFrame!
+  // (keeping in sync means deleting values is a multi-stage process; please
+  // ignore the UNUSED_TO_BE_DELETED<N> values).
   enum Format {
-    INVALID,     // Invalid format value.  Used for error reporting.
-    RGB555,      // 16bpp RGB packed 5:5:5
-    RGB565,      // 16bpp RGB packed 5:6:5
-    RGB24,       // 24bpp RGB packed 8:8:8
-    RGB32,       // 32bpp RGB packed with extra byte 8:8:8
-    RGBA,        // 32bpp RGBA packed 8:8:8:8
-    YV12,        // 12bpp YVU planar 1x1 Y, 2x2 VU samples
-    YV16,        // 16bpp YVU planar 1x1 Y, 2x1 VU samples
-    NV12,        // 12bpp YVU planar 1x1 Y, 2x2 UV interleaving samples
-    EMPTY,       // An empty frame.
-    ASCII,       // A frame with ASCII content. For testing only.
-    I420,        // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
-    NATIVE_TEXTURE,  // Native texture.  Pixel-format agnostic.
+    INVALID = 0,     // Invalid format value.  Used for error reporting.

[scherkus (not reviewing), 2012/04/10 21:32:31]

OCD nit: should these // be aligned or something because they're not!

[Ami GONE FROM CHROMIUM, 2012/04/10 22:01:07]

Done.

+    UNUSED_TO_BE_DELETED1 = 1,
+    UNUSED_TO_BE_DELETED2 = 2,
+    UNUSED_TO_BE_DELETED3 = 3,
+    RGB32 = 4,       // 32bpp RGB packed with extra byte 8:8:8
+    UNUSED_TO_BE_DELETED5 = 5,
+    YV12 = 6,        // 12bpp YVU planar 1x1 Y, 2x2 VU samples
+    YV16 = 7,        // 16bpp YVU planar 1x1 Y, 2x1 VU samples
+    UNUSED_TO_BE_DELETED8 = 8,
+    EMPTY = 9,       // An empty frame.
+    UNUSED_TO_BE_DELETED10 = 10,
+    I420 = 11,        // 12bpp YVU planar 1x1 Y, 2x2 UV samples.
+    NATIVE_TEXTURE = 12,  // Native texture.  Pixel-format agnostic.
   };
 
   // Creates a new frame in system memory with given parameters. Buffers for
   // the frame are allocated but not initialized.
   static scoped_refptr<VideoFrame> CreateFrame(
       Format format,
       size_t width,
       size_t height,
       base::TimeDelta timestamp,
       base::TimeDelta duration);
@@ skipping 110 matching lines @@
 
   base::TimeDelta timestamp_;
   base::TimeDelta duration_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoFrame);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_FRAME_H_