Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Side by Side Diff: content/common/media/media_param_traits.cc

Issue 1275783003: Add a virtual beamforming audio device on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix some cross-platform errors. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/common/media/media_param_traits.h" 5 #include "content/common/media/media_param_traits.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "content/common/media/audio_messages.h" 8 #include "content/common/media/audio_messages.h"
9 #include "content/common/media/video_capture_messages.h" 9 #include "content/common/media/video_capture_messages.h"
10 #include "ipc/ipc_message_utils.h" 10 #include "ipc/ipc_message_utils.h"
11 #include "media/audio/audio_parameters.h" 11 #include "media/audio/audio_parameters.h"
12 #include "media/audio/point.h"
12 #include "media/base/limits.h" 13 #include "media/base/limits.h"
13 #include "ui/gfx/ipc/gfx_param_traits.h" 14 #include "ui/gfx/ipc/gfx_param_traits.h"
14 15
15 using media::AudioParameters; 16 using media::AudioParameters;
16 using media::ChannelLayout; 17 using media::ChannelLayout;
17 using media::VideoCaptureFormat; 18 using media::VideoCaptureFormat;
18 19
19 namespace IPC { 20 namespace IPC {
20 21
21 void ParamTraits<AudioParameters>::Write(Message* m, 22 void ParamTraits<AudioParameters>::Write(Message* m,
22 const AudioParameters& p) { 23 const AudioParameters& p) {
23 WriteParam(m, p.format()); 24 WriteParam(m, p.format());
24 WriteParam(m, p.channel_layout()); 25 WriteParam(m, p.channel_layout());
25 WriteParam(m, p.sample_rate()); 26 WriteParam(m, p.sample_rate());
26 WriteParam(m, p.bits_per_sample()); 27 WriteParam(m, p.bits_per_sample());
27 WriteParam(m, p.frames_per_buffer()); 28 WriteParam(m, p.frames_per_buffer());
28 WriteParam(m, p.channels()); 29 WriteParam(m, p.channels());
29 WriteParam(m, p.effects()); 30 WriteParam(m, p.effects());
31 WriteParam(m, p.mic_positions());
30 } 32 }
31 33
32 bool ParamTraits<AudioParameters>::Read(const Message* m, 34 bool ParamTraits<AudioParameters>::Read(const Message* m,
33 base::PickleIterator* iter, 35 base::PickleIterator* iter,
34 AudioParameters* r) { 36 AudioParameters* r) {
35 AudioParameters::Format format; 37 AudioParameters::Format format;
36 ChannelLayout channel_layout; 38 ChannelLayout channel_layout;
37 int sample_rate, bits_per_sample, frames_per_buffer, channels, effects; 39 int sample_rate, bits_per_sample, frames_per_buffer, channels, effects;
40 std::vector<media::Point> mic_positions;
38 41
39 if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) || 42 if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) ||
40 !ReadParam(m, iter, &sample_rate) || 43 !ReadParam(m, iter, &sample_rate) ||
41 !ReadParam(m, iter, &bits_per_sample) || 44 !ReadParam(m, iter, &bits_per_sample) ||
42 !ReadParam(m, iter, &frames_per_buffer) || 45 !ReadParam(m, iter, &frames_per_buffer) ||
43 !ReadParam(m, iter, &channels) || !ReadParam(m, iter, &effects)) { 46 !ReadParam(m, iter, &channels) || !ReadParam(m, iter, &effects) ||
47 !ReadParam(m, iter, &mic_positions)) {
44 return false; 48 return false;
45 } 49 }
46 50
47 AudioParameters params(format, channel_layout, channels, sample_rate, 51 AudioParameters params(format, channels, channel_layout, sample_rate,
48 bits_per_sample, frames_per_buffer, effects); 52 bits_per_sample, frames_per_buffer, mic_positions,
53 effects);
49 *r = params; 54 *r = params;
50 return r->IsValid(); 55 return r->IsValid();
51 } 56 }
52 57
53 void ParamTraits<AudioParameters>::Log(const AudioParameters& p, 58 void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
54 std::string* l) { 59 std::string* l) {
55 l->append(base::StringPrintf("<AudioParameters>")); 60 l->append(base::StringPrintf("<AudioParameters>"));
56 } 61 }
57 62
63 void ParamTraits<media::Point>::Write(Message* m, const media::Point& p) {
ajm 2015/09/02 18:23:04 OS X has a "struct Point" in the global namespace
64 WriteParam(m, p.x());
65 WriteParam(m, p.y());
66 WriteParam(m, p.z());
67 }
68
69 bool ParamTraits<media::Point>::Read(const Message* m,
70 base::PickleIterator* iter,
71 media::Point* r) {
72 float x, y, z;
73
74 if (!ReadParam(m, iter, &x) || !ReadParam(m, iter, &y) ||
75 !ReadParam(m, iter, &z)) {
76 return false;
77 }
78
79 media::Point point(x, y, z);
80 *r = point;
81 return r->IsValid();
82 }
83
84 void ParamTraits<media::Point>::Log(const media::Point& p, std::string* l) {
85 l->append(base::StringPrintf("<Point> %s", p.ToString().c_str()));
86 }
87
58 void ParamTraits<VideoCaptureFormat>::Write(Message* m, 88 void ParamTraits<VideoCaptureFormat>::Write(Message* m,
59 const VideoCaptureFormat& p) { 89 const VideoCaptureFormat& p) {
60 WriteParam(m, p.frame_size); 90 WriteParam(m, p.frame_size);
61 WriteParam(m, p.frame_rate); 91 WriteParam(m, p.frame_rate);
62 WriteParam(m, p.pixel_format); 92 WriteParam(m, p.pixel_format);
63 WriteParam(m, p.pixel_storage); 93 WriteParam(m, p.pixel_storage);
64 } 94 }
65 95
66 bool ParamTraits<VideoCaptureFormat>::Read(const Message* m, 96 bool ParamTraits<VideoCaptureFormat>::Read(const Message* m,
67 base::PickleIterator* iter, 97 base::PickleIterator* iter,
68 VideoCaptureFormat* r) { 98 VideoCaptureFormat* r) {
69 if (!ReadParam(m, iter, &r->frame_size) || 99 if (!ReadParam(m, iter, &r->frame_size) ||
70 !ReadParam(m, iter, &r->frame_rate) || 100 !ReadParam(m, iter, &r->frame_rate) ||
71 !ReadParam(m, iter, &r->pixel_format) || 101 !ReadParam(m, iter, &r->pixel_format) ||
72 !ReadParam(m, iter, &r->pixel_storage)) { 102 !ReadParam(m, iter, &r->pixel_storage)) {
73 return false; 103 return false;
74 } 104 }
75 return r->IsValid(); 105 return r->IsValid();
76 } 106 }
77 107
78 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p, 108 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
79 std::string* l) { 109 std::string* l) {
80 l->append(base::StringPrintf("<VideoCaptureFormat> %s", 110 l->append(base::StringPrintf("<VideoCaptureFormat> %s",
81 media::VideoCaptureFormat::ToString(p).c_str())); 111 media::VideoCaptureFormat::ToString(p).c_str()));
82 } 112 }
83 113
84 } 114 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698