Reland: Video Capture: extract storage info from pixel format in VideoCaptureFormat.

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/base/video_capture_types.h"
 
 using media::AudioParameters;
 using media::ChannelLayout;
 using media::VideoCaptureFormat;
 using media::VideoPixelFormat;
+using media::VideoPixelStorage;
 
 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 30 matching lines @@
   l->append(base::StringPrintf("<AudioParameters>"));
 }
 
 void ParamTraits<VideoCaptureFormat>::Write(Message* m,
                                             const VideoCaptureFormat& p) {
   // Crash during Send rather than have a failure at the message handler.
   m->WriteInt(p.frame_size.width());
   m->WriteInt(p.frame_size.height());
   m->WriteFloat(p.frame_rate);
   m->WriteInt(static_cast<int>(p.pixel_format));
+  m->WriteInt(static_cast<int>(p.pixel_storage));
 }
 
 bool ParamTraits<VideoCaptureFormat>::Read(const Message* m,
                                            base::PickleIterator* iter,
                                            VideoCaptureFormat* r) {
-  int frame_size_width, frame_size_height, pixel_format;
+  int frame_size_width, frame_size_height, pixel_format, pixel_storage;
   if (!iter->ReadInt(&frame_size_width) ||
       !iter->ReadInt(&frame_size_height) ||
       !iter->ReadFloat(&r->frame_rate) ||
-      !iter->ReadInt(&pixel_format))
+      !iter->ReadInt(&pixel_format) ||
+      !iter->ReadInt(&pixel_storage))

[mcasas, 2015/06/24 21:23:23]

dcheng@ Please change all of these to use ReadParam(). This will simplify your
IsValid()
method (you won't need to check that the enum values are in bounds, for
example), and you won't need the awkward static_cast below.

Done.

     return false;
 
   r->frame_size.SetSize(frame_size_width, frame_size_height);
   r->pixel_format = static_cast<VideoPixelFormat>(pixel_format);
-  if (!r->IsValid())
-    return false;
-  return true;
+  r->pixel_storage = static_cast<VideoPixelStorage>(pixel_storage);
+  return r->IsValid();
 }
 
 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
                                           std::string* l) {
   l->append(base::StringPrintf("<VideoCaptureFormat>"));
 }
 
 }