Use safer IPC serializations in media_param_traits.cc

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 "content/common/media/audio_messages.h"
 #include "content/common/media/video_capture_messages.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/audio/audio_parameters.h"
 #include "media/base/limits.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
 using media::AudioParameters;
 using media::ChannelLayout;
 using media::VideoCaptureFormat;
 
 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());
-  m->WriteInt(p.channels());
-  m->WriteInt(p.effects());
+  WriteParam(m, p.format());
+  WriteParam(m, p.channel_layout());
+  WriteParam(m, p.sample_rate());
+  WriteParam(m, p.bits_per_sample());
+  WriteParam(m, p.frames_per_buffer());
+  WriteParam(m, p.channels());
+  WriteParam(m, p.effects());
 }
 
 bool ParamTraits<AudioParameters>::Read(const Message* m,
                                         base::PickleIterator* iter,
                                         AudioParameters* r) {
-  int format, channel_layout, sample_rate, bits_per_sample,
-      frames_per_buffer, channels, effects;
+  AudioParameters::Format format;
+  ChannelLayout channel_layout;
+  int sample_rate, bits_per_sample, frames_per_buffer, channels, effects;
 
-  if (!iter->ReadInt(&format) ||
-      !iter->ReadInt(&channel_layout) ||
-      !iter->ReadInt(&sample_rate) ||
-      !iter->ReadInt(&bits_per_sample) ||
-      !iter->ReadInt(&frames_per_buffer) ||
-      !iter->ReadInt(&channels) ||
-      !iter->ReadInt(&effects)) {
+  if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) ||

[Tom Sepez, 2015/06/30 15:37:07]

nit: I'd still prefer one per line.

[dcheng, 2015/06/30 18:11:59]

This is due to clang-format: if you feel strongly about this, I can revert, but
I'd prefer not to fight the tooling.

[Tom Sepez, 2015/06/30 19:43:22]

No worries.  Let's leave it as is.

+      !ReadParam(m, iter, &sample_rate) ||
+      !ReadParam(m, iter, &bits_per_sample) ||
+      !ReadParam(m, iter, &frames_per_buffer) ||
+      !ReadParam(m, iter, &channels) || !ReadParam(m, iter, &effects)) {
     return false;
   }
 
-  AudioParameters params(static_cast<AudioParameters::Format>(format),
-         static_cast<ChannelLayout>(channel_layout), channels,
-         sample_rate, bits_per_sample, frames_per_buffer, effects);
+  AudioParameters params(format, channel_layout, channels, sample_rate,
+                         bits_per_sample, frames_per_buffer, effects);
   *r = params;
   return r->IsValid();
 }
 
 void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
                                        std::string* l) {
   l->append(base::StringPrintf("<AudioParameters>"));
 }
 
 void ParamTraits<VideoCaptureFormat>::Write(Message* m,
@@ skipping 16 matching lines @@
   return r->IsValid();
 }
 
 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
                                           std::string* l) {
   l->append(
       base::StringPrintf("<VideoCaptureFormat> %s", p.ToString().c_str()));
 }
 
 }