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

remoting/base/util.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 "remoting/base/util.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 using media::VideoFrame;
 
 namespace remoting {
 
+enum { kBytesPerPixelRGB32 = 4 };
+
 // Do not write LOG messages in this routine since it is called from within
 // our LOG message handler. Bad things will happen.
 std::string GetTimestampString() {
   base::Time t = base::Time::NowFromSystemTime();
   base::Time::Exploded tex;
   t.LocalExplode(&tex);
   return StringPrintf("%02d%02d/%02d%02d%02d:",
                       tex.month, tex.day_of_month,
                       tex.hour, tex.minute, tex.second);
 }
 
-int GetBytesPerPixel(VideoFrame::Format format) {
-  // Note: The order is important here for performance. This is sorted from the
-  // most common to the less common (PIXEL_FORMAT_ASCII is mostly used
-  // just for testing).
-  switch (format) {
-    case VideoFrame::RGB24:  return 3;
-    case VideoFrame::RGB565: return 2;
-    case VideoFrame::RGB32:  return 4;
-    case VideoFrame::ASCII:  return 1;
-    default:
-      NOTREACHED() << "Pixel format not supported";
-      return 0;
-  }
-}
-
 // Helper methods to calculate plane offset given the coordinates.
 static int CalculateRGBOffset(int x, int y, int stride) {
-  return stride * y + GetBytesPerPixel(media::VideoFrame::RGB32) * x;
+  return stride * y + kBytesPerPixelRGB32 * x;
 }
 
 static int CalculateYOffset(int x, int y, int stride) {
   DCHECK(((x & 1) == 0) && ((y & 1) == 0));
   return stride * y + x;
 }
 
 static int CalculateUVOffset(int x, int y, int stride) {
   DCHECK(((x & 1) == 0) && ((y & 1) == 0));
   return stride * y / 2 + x / 2;
@@ skipping 208 matching lines @@
                                          source_stride);
   int dest_offset = CalculateRGBOffset(dest_rect.x() - dest_buffer_rect.x(),
                                        dest_rect.y() - dest_buffer_rect.y(),
                                        source_stride);
 
   // Copy bits.
   CopyRect(source_buffer + source_offset,
            source_stride,
            dest_buffer + dest_offset,
            dest_stride,
-           GetBytesPerPixel(media::VideoFrame::RGB32),
+           kBytesPerPixelRGB32,
            SkIRect::MakeWH(dest_rect.width(), dest_rect.height()));
 }
 
 }  // namespace remoting