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

media/base/video_frame.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/base/video_frame.h"
 
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "media/base/limits.h"
 #include "media/base/video_util.h"
 
 namespace media {
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::CreateFrame(
     VideoFrame::Format format,
     size_t width,
     size_t height,
     base::TimeDelta timestamp,
     base::TimeDelta duration) {
   DCHECK(IsValidConfig(format, width, height));
   scoped_refptr<VideoFrame> frame(new VideoFrame(
       format, width, height, timestamp, duration));
   switch (format) {
-    case VideoFrame::RGB555:
-    case VideoFrame::RGB565:
-      frame->AllocateRGB(2u);
-      break;
-    case VideoFrame::RGB24:
-      frame->AllocateRGB(3u);
-      break;
     case VideoFrame::RGB32:
-    case VideoFrame::RGBA:
       frame->AllocateRGB(4u);
       break;
     case VideoFrame::YV12:
     case VideoFrame::YV16:
       frame->AllocateYUV();
       break;
-    case VideoFrame::ASCII:
-      frame->AllocateRGB(1u);
-      break;
     default:
-      NOTREACHED();
+      NOTREACHED() << format;
       return NULL;

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

do we expect clients to handle NULL from CreateFrame() or is this a CHECK()able
offence?

I'd vote for the latter!

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

Done.

   }
   return frame;
 }
 
 // static
 bool VideoFrame::IsValidConfig(
     VideoFrame::Format format,
     size_t width,
     size_t height) {
 
@@ skipping 112 matching lines @@
   }
 
   // In multi-plane allocations, only a single block of memory is allocated
   // on the heap, and other |data| pointers point inside the same, single block
   // so just delete index 0.
   delete[] data_[0];
 }
 
 bool VideoFrame::IsValidPlane(size_t plane) const {
   switch (format_) {
-    case RGB555:
-    case RGB565:
-    case RGB24:
     case RGB32:
-    case RGBA:
       return plane == kRGBPlane;
 
     case YV12:
     case YV16:
       return plane == kYPlane || plane == kUPlane || plane == kVPlane;
 
     case NATIVE_TEXTURE:
       NOTREACHED() << "NATIVE_TEXTUREs don't use plane-related methods!";
       return false;
 
     default:
       break;
   }
 
   // Intentionally leave out non-production formats.
   NOTREACHED() << "Unsupported video frame format: " << format_;
   return false;
 }
 
 int VideoFrame::stride(size_t plane) const {
   DCHECK(IsValidPlane(plane));
   return strides_[plane];
 }
 
 int VideoFrame::row_bytes(size_t plane) const {
   DCHECK(IsValidPlane(plane));
   switch (format_) {
-    // 16bpp.
-    case RGB555:
-    case RGB565:
-      return width_ * 2;
-
-    // 24bpp.
-    case RGB24:
-      return width_ * 3;
-
     // 32bpp.
     case RGB32:
-    case RGBA:
       return width_ * 4;
 
     // Planar, 8bpp.
     case YV12:
     case YV16:
       if (plane == kYPlane)
         return width_;
       return RoundUp(width_, 2) / 2;
 
     default:
       break;
   }
 
   // Intentionally leave out non-production formats.
   NOTREACHED() << "Unsupported video frame format: " << format_;
   return 0;
 }
 
 int VideoFrame::rows(size_t plane) const {
   DCHECK(IsValidPlane(plane));
   switch (format_) {
-    case RGB555:
-    case RGB565:
-    case RGB24:
     case RGB32:
-    case RGBA:
     case YV16:
       return height_;
 
     case YV12:
       if (plane == kYPlane)
         return height_;
       return RoundUp(height_, 2) / 2;
 
     default:
       break;
@@ skipping 29 matching lines @@
       break;
     for(int row = 0; row < rows(plane); row++) {
       base::MD5Update(context, base::StringPiece(
           reinterpret_cast<char*>(data(plane) + stride(plane) * row),
           row_bytes(plane)));
     }
   }
 }
 
 }  // namespace media