| Index: content/common/media/media_param_traits.cc
 | 
| ===================================================================
 | 
| --- content/common/media/media_param_traits.cc	(revision 181072)
 | 
| +++ content/common/media/media_param_traits.cc	(working copy)
 | 
| @@ -24,23 +24,25 @@
 | 
|    m->WriteInt(p.bits_per_sample());
 | 
|    m->WriteInt(p.frames_per_buffer());
 | 
|    m->WriteInt(p.channels());
 | 
| +  m->WriteInt(p.input_channels());
 | 
|  }
 | 
|  
 | 
|  bool ParamTraits<AudioParameters>::Read(const Message* m,
 | 
|                                          PickleIterator* iter,
 | 
|                                          AudioParameters* r) {
 | 
|    int format, channel_layout, sample_rate, bits_per_sample,
 | 
| -      frames_per_buffer, channels;
 | 
| +      frames_per_buffer, channels, input_channels;
 | 
|  
 | 
|    if (!m->ReadInt(iter, &format) ||
 | 
|        !m->ReadInt(iter, &channel_layout) ||
 | 
|        !m->ReadInt(iter, &sample_rate) ||
 | 
|        !m->ReadInt(iter, &bits_per_sample) ||
 | 
|        !m->ReadInt(iter, &frames_per_buffer) ||
 | 
| -      !m->ReadInt(iter, &channels))
 | 
| +      !m->ReadInt(iter, &channels) ||
 | 
| +      !m->ReadInt(iter, &input_channels))
 | 
|      return false;
 | 
|    r->Reset(static_cast<AudioParameters::Format>(format),
 | 
| -           static_cast<ChannelLayout>(channel_layout),
 | 
| +           static_cast<ChannelLayout>(channel_layout), input_channels,
 | 
|             sample_rate, bits_per_sample, frames_per_buffer);
 | 
|    if (!r->IsValid())
 | 
|      return false;
 | 
| 
 |