Consolidate duplicated frame / capability structures in video_capture_types.h

content/common/media/media_param_traits.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 "content/common/media/media_param_traits.h"
 
 #include "base/strings/stringprintf.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/limits.h"
 #include "media/video/capture/video_capture_types.h"
@@ skipping 40 matching lines @@
 
 void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
                                        std::string* l) {
   l->append(base::StringPrintf("<AudioParameters>"));
 }
 
 void ParamTraits<VideoCaptureParams>::Write(Message* m,
                                             const VideoCaptureParams& p) {
   m->WriteInt(p.width);
   m->WriteInt(p.height);
-  m->WriteInt(p.frame_per_second);
+  m->WriteInt(p.frame_rate);
   m->WriteInt(static_cast<int>(p.session_id));
   m->WriteInt(static_cast<int>(p.frame_size_type));
 }
 
 bool ParamTraits<VideoCaptureParams>::Read(const Message* m,
                                            PickleIterator* iter,
                                            VideoCaptureParams* r) {
   int session_id, frame_size_type;
   if (!m->ReadInt(iter, &r->width) ||
       !m->ReadInt(iter, &r->height) ||
-      !m->ReadInt(iter, &r->frame_per_second) ||
+      !m->ReadInt(iter, &r->frame_rate) ||
       !m->ReadInt(iter, &session_id) ||
       !m->ReadInt(iter, &frame_size_type))
     return false;
 
   r->session_id = static_cast<VideoCaptureSessionId>(session_id);
   r->frame_size_type =
       static_cast<media::VideoCaptureResolutionType>(
           frame_size_type);
-
-  // TODO(wjia): Replace with IsValid() method on VideoCaptureParams.
-  if (r->width <= 0 || r->height <= 0 || r->frame_per_second <= 0 ||
-      r->frame_per_second > media::limits::kMaxFramesPerSecond ||
-      r->width > media::limits::kMaxDimension ||
-      r->height > media::limits::kMaxDimension ||
-      r->width * r->height > media::limits::kMaxCanvas ||
-      r->frame_size_type < 0 ||
-      r->frame_size_type >= media::MaxVideoCaptureResolutionType) {
+  if (!r->IsValid())
     return false;
-  }
-
   return true;
 }
 
 void ParamTraits<VideoCaptureParams>::Log(const VideoCaptureParams& p,
                                           std::string* l) {
   l->append(base::StringPrintf("<VideoCaptureParams>"));
 }
 
 }