Use safer IPC serializations in media_param_traits.cc

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"
 
@@ skipping 24 matching lines @@
       pixel_storage(pixel_storage) {
 }
 
 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);
 }
 
 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:
@@ skipping 46 matching lines @@
     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_MAX:
-      break;
   }
   NOTREACHED() << "Invalid VideoPixelFormat provided: " << format;
   return std::string();
 }
 
 //static
 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: "
                << static_cast<int>(storage);
   return std::string();
 }
 
 VideoCaptureParams::VideoCaptureParams()
     : resolution_change_policy(RESOLUTION_POLICY_FIXED_RESOLUTION),
       use_gpu_memory_buffers(false) {
 }
 
 }  // namespace media