Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/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"
 
 using media::AudioParameters;
 using media::ChannelLayout;
 using media::VideoCaptureFormat;
-using media::VideoPixelFormat;
+using media::VideoCaptureSessionId;
 
 namespace IPC {
 
 void ParamTraits<AudioParameters>::Write(Message* m,
                                          const AudioParameters& p) {
   m->WriteInt(static_cast<int>(p.format()));
   m->WriteInt(static_cast<int>(p.channel_layout()));
   m->WriteInt(p.sample_rate());
   m->WriteInt(p.bits_per_sample());
   m->WriteInt(p.frames_per_buffer());
@@ skipping 23 matching lines @@
   return true;
 }
 
 void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
                                        std::string* l) {
   l->append(base::StringPrintf("<AudioParameters>"));
 }
 
 void ParamTraits<VideoCaptureFormat>::Write(Message* m,
                                             const VideoCaptureFormat& p) {
-  m->WriteInt(p.frame_size.width());
-  m->WriteInt(p.frame_size.height());
+  m->WriteInt(p.width);
+  m->WriteInt(p.height);
   m->WriteInt(p.frame_rate);
-  m->WriteInt(static_cast<int>(p.pixel_format));
+  m->WriteInt(static_cast<int>(p.frame_size_type));
 }
 
 bool ParamTraits<VideoCaptureFormat>::Read(const Message* m,
                                            PickleIterator* iter,
                                            VideoCaptureFormat* r) {
-  int frame_size_width, frame_size_height, pixel_format;
-  if (!m->ReadInt(iter, &frame_size_width) ||
-      !m->ReadInt(iter, &frame_size_height) ||
+  int frame_size_type;
+  if (!m->ReadInt(iter, &r->width) ||
+      !m->ReadInt(iter, &r->height) ||
       !m->ReadInt(iter, &r->frame_rate) ||
-      !m->ReadInt(iter, &pixel_format))
+      !m->ReadInt(iter, &frame_size_type))
     return false;
 
-  r->frame_size.SetSize(frame_size_width, frame_size_height);
-  r->pixel_format = static_cast<VideoPixelFormat>(pixel_format);
+  r->frame_size_type =
+      static_cast<media::VideoCaptureResolutionType>(
+          frame_size_type);
   if (!r->IsValid())
     return false;
   return true;
 }
 
 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
                                           std::string* l) {
   l->append(base::StringPrintf("<VideoCaptureFormat>"));
 }
 
 }