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/limits.h" | 11 #include "media/base/limits.h" |
12 #include "media/base/video_capture_types.h" | 12 #include "media/base/video_capture_types.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::ChannelLayout; | 19 using media::ChannelLayout; |
19 using media::VideoCaptureFormat; | 20 using media::VideoCaptureFormat; |
20 | 21 |
21 namespace IPC { | 22 namespace IPC { |
22 | 23 |
23 void ParamTraits<AudioParameters>::GetSize(base::PickleSizer* s, | 24 void ParamTraits<AudioParameters>::GetSize(base::PickleSizer* s, |
24 const AudioParameters& p) { | 25 const AudioParameters& p) { |
25 GetParamSize(s, p.format()); | 26 GetParamSize(s, p.format()); |
26 GetParamSize(s, p.channel_layout()); | 27 GetParamSize(s, p.channel_layout()); |
27 GetParamSize(s, p.sample_rate()); | 28 GetParamSize(s, p.sample_rate()); |
28 GetParamSize(s, p.bits_per_sample()); | 29 GetParamSize(s, p.bits_per_sample()); |
29 GetParamSize(s, p.frames_per_buffer()); | 30 GetParamSize(s, p.frames_per_buffer()); |
30 GetParamSize(s, p.channels()); | 31 GetParamSize(s, p.channels()); |
31 GetParamSize(s, p.effects()); | 32 GetParamSize(s, p.effects()); |
32 GetParamSize(s, p.mic_positions()); | 33 GetParamSize(s, p.mic_positions()); |
| 34 GetParamSize(s, p.latency_tag()); |
33 } | 35 } |
34 | 36 |
35 void ParamTraits<AudioParameters>::Write(base::Pickle* m, | 37 void ParamTraits<AudioParameters>::Write(base::Pickle* m, |
36 const AudioParameters& p) { | 38 const AudioParameters& p) { |
37 WriteParam(m, p.format()); | 39 WriteParam(m, p.format()); |
38 WriteParam(m, p.channel_layout()); | 40 WriteParam(m, p.channel_layout()); |
39 WriteParam(m, p.sample_rate()); | 41 WriteParam(m, p.sample_rate()); |
40 WriteParam(m, p.bits_per_sample()); | 42 WriteParam(m, p.bits_per_sample()); |
41 WriteParam(m, p.frames_per_buffer()); | 43 WriteParam(m, p.frames_per_buffer()); |
42 WriteParam(m, p.channels()); | 44 WriteParam(m, p.channels()); |
43 WriteParam(m, p.effects()); | 45 WriteParam(m, p.effects()); |
44 WriteParam(m, p.mic_positions()); | 46 WriteParam(m, p.mic_positions()); |
| 47 WriteParam(m, p.latency_tag()); |
45 } | 48 } |
46 | 49 |
47 bool ParamTraits<AudioParameters>::Read(const base::Pickle* m, | 50 bool ParamTraits<AudioParameters>::Read(const base::Pickle* m, |
48 base::PickleIterator* iter, | 51 base::PickleIterator* iter, |
49 AudioParameters* r) { | 52 AudioParameters* r) { |
50 AudioParameters::Format format; | 53 AudioParameters::Format format; |
51 ChannelLayout channel_layout; | 54 ChannelLayout channel_layout; |
52 int sample_rate, bits_per_sample, frames_per_buffer, channels, effects; | 55 int sample_rate, bits_per_sample, frames_per_buffer, channels, effects; |
53 std::vector<media::Point> mic_positions; | 56 std::vector<media::Point> mic_positions; |
| 57 AudioLatency::LatencyType latency_tag; |
54 | 58 |
55 if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) || | 59 if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) || |
56 !ReadParam(m, iter, &sample_rate) || | 60 !ReadParam(m, iter, &sample_rate) || |
57 !ReadParam(m, iter, &bits_per_sample) || | 61 !ReadParam(m, iter, &bits_per_sample) || |
58 !ReadParam(m, iter, &frames_per_buffer) || | 62 !ReadParam(m, iter, &frames_per_buffer) || |
59 !ReadParam(m, iter, &channels) || !ReadParam(m, iter, &effects) || | 63 !ReadParam(m, iter, &channels) || !ReadParam(m, iter, &effects) || |
60 !ReadParam(m, iter, &mic_positions)) { | 64 !ReadParam(m, iter, &mic_positions) || |
| 65 !ReadParam(m, iter, &latency_tag)) { |
61 return false; | 66 return false; |
62 } | 67 } |
63 | 68 |
64 AudioParameters params(format, channel_layout, sample_rate, bits_per_sample, | 69 AudioParameters params(format, channel_layout, sample_rate, bits_per_sample, |
65 frames_per_buffer); | 70 frames_per_buffer); |
66 params.set_channels_for_discrete(channels); | 71 params.set_channels_for_discrete(channels); |
67 params.set_effects(effects); | 72 params.set_effects(effects); |
68 params.set_mic_positions(mic_positions); | 73 params.set_mic_positions(mic_positions); |
| 74 params.set_latency_tag(latency_tag); |
69 | 75 |
70 *r = params; | 76 *r = params; |
71 return r->IsValid(); | 77 return r->IsValid(); |
72 } | 78 } |
73 | 79 |
74 void ParamTraits<AudioParameters>::Log(const AudioParameters& p, | 80 void ParamTraits<AudioParameters>::Log(const AudioParameters& p, |
75 std::string* l) { | 81 std::string* l) { |
76 l->append(base::StringPrintf("<AudioParameters>")); | 82 l->append(base::StringPrintf("<AudioParameters>")); |
77 } | 83 } |
78 | 84 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ | 138 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |
133 #include "media/base/ipc/media_param_traits_macros.h" | 139 #include "media/base/ipc/media_param_traits_macros.h" |
134 } // namespace IPC | 140 } // namespace IPC |
135 | 141 |
136 // Generate param traits log methods. | 142 // Generate param traits log methods. |
137 #include "ipc/param_traits_log_macros.h" | 143 #include "ipc/param_traits_log_macros.h" |
138 namespace IPC { | 144 namespace IPC { |
139 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ | 145 #undef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |
140 #include "media/base/ipc/media_param_traits_macros.h" | 146 #include "media/base/ipc/media_param_traits_macros.h" |
141 } // namespace IPC | 147 } // namespace IPC |
OLD | NEW |