| 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 8233f3d53625bb6185caf7cb29329a98a56dfe5f..74bea22e33084faa6541a13926090f7076419f30 100644
|
| --- a/media/base/ipc/media_param_traits.cc
|
| +++ b/media/base/ipc/media_param_traits.cc
|
| @@ -10,6 +10,7 @@
|
| #include "media/base/audio_point.h"
|
| #include "media/base/encryption_scheme.h"
|
| #include "media/base/limits.h"
|
| +#include "media/base/output_device_info.h"
|
| #include "ui/gfx/ipc/geometry/gfx_param_traits.h"
|
| #include "ui/gfx/ipc/gfx_param_traits.h"
|
| #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
|
| @@ -17,6 +18,7 @@
|
| using media::AudioParameters;
|
| using media::AudioLatency;
|
| using media::ChannelLayout;
|
| +using media::OutputDeviceInfo;
|
|
|
| namespace IPC {
|
|
|
| @@ -149,6 +151,43 @@ void ParamTraits<media::EncryptionScheme::Pattern>::Log(const param_type& p,
|
| l->append(base::StringPrintf("<Pattern>"));
|
| }
|
|
|
| +void ParamTraits<OutputDeviceInfo>::GetSize(base::PickleSizer* s,
|
| + const OutputDeviceInfo& p) {
|
| + GetParamSize(s, p.device_id());
|
| + GetParamSize(s, p.device_status());
|
| + GetParamSize(s, p.output_params());
|
| +}
|
| +
|
| +void ParamTraits<OutputDeviceInfo>::Write(base::Pickle* m,
|
| + const OutputDeviceInfo& p) {
|
| + WriteParam(m, p.device_id());
|
| + WriteParam(m, p.device_status());
|
| + WriteParam(m, p.output_params());
|
| +}
|
| +
|
| +bool ParamTraits<OutputDeviceInfo>::Read(const base::Pickle* m,
|
| + base::PickleIterator* iter,
|
| + OutputDeviceInfo* r) {
|
| + std::string device_id;
|
| + media::OutputDeviceStatus device_status;
|
| + AudioParameters output_params;
|
| +
|
| + if (!ReadParam(m, iter, &device_id) || !ReadParam(m, iter, &device_status) ||
|
| + !ReadParam(m, iter, &output_params)) {
|
| + return false;
|
| + }
|
| +
|
| + OutputDeviceInfo info(device_id, device_status, output_params);
|
| +
|
| + *r = info;
|
| + return true;
|
| +}
|
| +
|
| +void ParamTraits<OutputDeviceInfo>::Log(const OutputDeviceInfo& p,
|
| + std::string* l) {
|
| + l->append(base::StringPrintf("<OutputDeviceInfo>"));
|
| +}
|
| +
|
| } // namespace IPC
|
|
|
| // Generate param traits size methods.
|
|
|