| Index: media/base/ipc/media_param_traits.cc
|
| diff --git a/media/base/ipc/media_param_traits.cc b/media/base/ipc/media_param_traits.cc
|
| index e91012fecce74ac928dd62814f84b41de75d1dcc..3e23a53e7c409089eac7c667fd0c6ddbd25aca9a 100644
|
| --- a/media/base/ipc/media_param_traits.cc
|
| +++ b/media/base/ipc/media_param_traits.cc
|
| @@ -15,6 +15,7 @@
|
| #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
|
|
|
| using media::AudioParameters;
|
| +using media::AudioLatency;
|
| using media::ChannelLayout;
|
| using media::VideoCaptureFormat;
|
|
|
| @@ -30,6 +31,7 @@ void ParamTraits<AudioParameters>::GetSize(base::PickleSizer* s,
|
| GetParamSize(s, p.channels());
|
| GetParamSize(s, p.effects());
|
| GetParamSize(s, p.mic_positions());
|
| + GetParamSize(s, p.latency_tag());
|
| }
|
|
|
| void ParamTraits<AudioParameters>::Write(base::Pickle* m,
|
| @@ -42,6 +44,7 @@ void ParamTraits<AudioParameters>::Write(base::Pickle* m,
|
| WriteParam(m, p.channels());
|
| WriteParam(m, p.effects());
|
| WriteParam(m, p.mic_positions());
|
| + WriteParam(m, p.latency_tag());
|
| }
|
|
|
| bool ParamTraits<AudioParameters>::Read(const base::Pickle* m,
|
| @@ -51,13 +54,15 @@ bool ParamTraits<AudioParameters>::Read(const base::Pickle* m,
|
| ChannelLayout channel_layout;
|
| int sample_rate, bits_per_sample, frames_per_buffer, channels, effects;
|
| std::vector<media::Point> mic_positions;
|
| + AudioLatency::LatencyType latency_tag;
|
|
|
| if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) ||
|
| !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) ||
|
| - !ReadParam(m, iter, &mic_positions)) {
|
| + !ReadParam(m, iter, &mic_positions) ||
|
| + !ReadParam(m, iter, &latency_tag)) {
|
| return false;
|
| }
|
|
|
| @@ -66,6 +71,7 @@ bool ParamTraits<AudioParameters>::Read(const base::Pickle* m,
|
| params.set_channels_for_discrete(channels);
|
| params.set_effects(effects);
|
| params.set_mic_positions(mic_positions);
|
| + params.set_latency_tag(latency_tag);
|
|
|
| *r = params;
|
| return r->IsValid();
|
|
|