Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/base/ipc/media_param_traits.h" | 5 #include "media/base/ipc/media_param_traits.h" |
| 6 | 6 |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "ipc/ipc_message_utils.h" | 8 #include "ipc/ipc_message_utils.h" |
| 9 #include "media/base/audio_parameters.h" | 9 #include "media/base/audio_parameters.h" |
| 10 #include "media/base/audio_point.h" | 10 #include "media/base/audio_point.h" |
| 11 #include "media/base/encryption_scheme.h" | 11 #include "media/base/encryption_scheme.h" |
| 12 #include "media/base/limits.h" | 12 #include "media/base/limits.h" |
| 13 #include "ui/gfx/ipc/geometry/gfx_param_traits.h" | 13 #include "ui/gfx/ipc/geometry/gfx_param_traits.h" |
| 14 #include "ui/gfx/ipc/gfx_param_traits.h" | 14 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 15 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" | 15 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" |
| 16 | 16 |
| 17 using media::AudioParameters; | 17 using media::AudioParameters; |
| 18 using media::AudioLatency; | 18 using media::AudioLatency; |
| 19 using media::ChannelLayout; | 19 using media::ChannelLayout; |
| 20 using CameraCalibration = | |
| 21 media::VideoCaptureDeviceDescriptor::CameraCalibration; | |
| 20 | 22 |
| 21 namespace IPC { | 23 namespace IPC { |
| 22 | 24 |
| 23 void ParamTraits<AudioParameters>::GetSize(base::PickleSizer* s, | 25 void ParamTraits<AudioParameters>::GetSize(base::PickleSizer* s, |
| 24 const AudioParameters& p) { | 26 const AudioParameters& p) { |
| 25 GetParamSize(s, p.format()); | 27 GetParamSize(s, p.format()); |
| 26 GetParamSize(s, p.channel_layout()); | 28 GetParamSize(s, p.channel_layout()); |
| 27 GetParamSize(s, p.sample_rate()); | 29 GetParamSize(s, p.sample_rate()); |
| 28 GetParamSize(s, p.bits_per_sample()); | 30 GetParamSize(s, p.bits_per_sample()); |
| 29 GetParamSize(s, p.frames_per_buffer()); | 31 GetParamSize(s, p.frames_per_buffer()); |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 return false; | 144 return false; |
| 143 *r = media::EncryptionScheme::Pattern(encrypt_blocks, skip_blocks); | 145 *r = media::EncryptionScheme::Pattern(encrypt_blocks, skip_blocks); |
| 144 return true; | 146 return true; |
| 145 } | 147 } |
| 146 | 148 |
| 147 void ParamTraits<media::EncryptionScheme::Pattern>::Log(const param_type& p, | 149 void ParamTraits<media::EncryptionScheme::Pattern>::Log(const param_type& p, |
| 148 std::string* l) { | 150 std::string* l) { |
| 149 l->append(base::StringPrintf("<Pattern>")); | 151 l->append(base::StringPrintf("<Pattern>")); |
| 150 } | 152 } |
| 151 | 153 |
| 154 void ParamTraits<CameraCalibration>::GetSize(base::PickleSizer* s, | |
| 155 const CameraCalibration& p) { | |
| 156 GetParamSize(s, p.focal_length_x); | |
| 157 GetParamSize(s, p.focal_length_y); | |
| 158 GetParamSize(s, p.depth_near); | |
| 159 GetParamSize(s, p.depth_far); | |
|
kinuko
2017/01/10 14:43:24
Wouldn't just add IPC_STRUCT_TRAITS for CameraCali
aleksandar.stojiljkovic
2017/01/11 08:58:46
Done.
| |
| 160 } | |
| 161 | |
| 162 void ParamTraits<CameraCalibration>::Write(base::Pickle* m, | |
| 163 const CameraCalibration& p) { | |
| 164 WriteParam(m, p.focal_length_x); | |
| 165 WriteParam(m, p.focal_length_y); | |
| 166 WriteParam(m, p.depth_near); | |
| 167 WriteParam(m, p.depth_far); | |
| 168 } | |
| 169 | |
| 170 bool ParamTraits<CameraCalibration>::Read(const base::Pickle* m, | |
| 171 base::PickleIterator* iter, | |
| 172 CameraCalibration* r) { | |
| 173 if (!ReadParam(m, iter, &r->focal_length_x) || | |
| 174 !ReadParam(m, iter, &r->focal_length_y) || | |
| 175 !ReadParam(m, iter, &r->depth_near) || | |
| 176 !ReadParam(m, iter, &r->depth_far)) { | |
| 177 return false; | |
| 178 } | |
| 179 return true; | |
| 180 } | |
| 181 | |
| 182 void ParamTraits<CameraCalibration>::Log(const CameraCalibration& p, | |
| 183 std::string* l) { | |
| 184 l->append(base::StringPrintf("<CameraCalibration>")); | |
| 185 } | |
| 186 | |
| 152 } // namespace IPC | 187 } // namespace IPC |
| 153 | 188 |
| 154 // Generate param traits size methods. | 189 // Generate param traits size methods. |
| 155 #include "ipc/param_traits_size_macros.h" | 190 #include "ipc/param_traits_size_macros.h" |
| 156 namespace IPC { | 191 namespace IPC { |
| 157 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ | 192 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |
| 158 #include "media/base/ipc/media_param_traits_macros.h" | 193 #include "media/base/ipc/media_param_traits_macros.h" |
| 159 } | 194 } |
| 160 | 195 |
| 161 // Generate param traits write methods. | 196 // Generate param traits write methods. |
| 162 #include "ipc/param_traits_write_macros.h" | 197 #include "ipc/param_traits_write_macros.h" |
| 163 namespace IPC { | 198 namespace IPC { |
| 164 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ | 199 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |
| 165 #include "media/base/ipc/media_param_traits_macros.h" | 200 #include "media/base/ipc/media_param_traits_macros.h" |
| 166 } // namespace IPC | 201 } // namespace IPC |
| 167 | 202 |
| 168 // Generate param traits read methods. | 203 // Generate param traits read methods. |
| 169 #include "ipc/param_traits_read_macros.h" | 204 #include "ipc/param_traits_read_macros.h" |
| 170 namespace IPC { | 205 namespace IPC { |
| 171 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ | 206 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |
| 172 #include "media/base/ipc/media_param_traits_macros.h" | 207 #include "media/base/ipc/media_param_traits_macros.h" |
| 173 } // namespace IPC | 208 } // namespace IPC |
| 174 | 209 |
| 175 // Generate param traits log methods. | 210 // Generate param traits log methods. |
| 176 #include "ipc/param_traits_log_macros.h" | 211 #include "ipc/param_traits_log_macros.h" |
| 177 namespace IPC { | 212 namespace IPC { |
| 178 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ | 213 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |
| 179 #include "media/base/ipc/media_param_traits_macros.h" | 214 #include "media/base/ipc/media_param_traits_macros.h" |
| 180 } // namespace IPC | 215 } // namespace IPC |
| OLD | NEW |