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

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 more constructors and disable for now. Created 5 years, 4 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/base/limits.h" 12 #include "media/base/limits.h"
13 #include "ui/gfx/ipc/gfx_param_traits.h" 13 #include "ui/gfx/ipc/gfx_param_traits.h"
14 14
15 using media::AudioParameters; 15 using media::AudioParameters;
16 using media::ChannelLayout; 16 using media::ChannelLayout;
17 using media::VideoCaptureFormat; 17 using media::VideoCaptureFormat;
18 18
19 namespace IPC { 19 namespace IPC {
20 20
21 void ParamTraits<AudioParameters>::Write(Message* m, 21 void ParamTraits<AudioParameters>::Write(Message* m,
22 const AudioParameters& p) { 22 const AudioParameters& p) {
23 WriteParam(m, p.format()); 23 WriteParam(m, p.format());
24 WriteParam(m, p.channel_layout()); 24 WriteParam(m, p.channel_layout());
25 WriteParam(m, p.sample_rate()); 25 WriteParam(m, p.sample_rate());
26 WriteParam(m, p.bits_per_sample()); 26 WriteParam(m, p.bits_per_sample());
27 WriteParam(m, p.frames_per_buffer()); 27 WriteParam(m, p.frames_per_buffer());
28 WriteParam(m, p.channels()); 28 WriteParam(m, p.channels());
29 WriteParam(m, p.effects()); 29 WriteParam(m, p.effects());
30 WriteParam(m, p.mic_positions());
30 } 31 }
31 32
32 bool ParamTraits<AudioParameters>::Read(const Message* m, 33 bool ParamTraits<AudioParameters>::Read(const Message* m,
33 base::PickleIterator* iter, 34 base::PickleIterator* iter,
34 AudioParameters* r) { 35 AudioParameters* r) {
35 AudioParameters::Format format; 36 AudioParameters::Format format;
36 ChannelLayout channel_layout; 37 ChannelLayout channel_layout;
37 int sample_rate, bits_per_sample, frames_per_buffer, channels, effects; 38 int sample_rate, bits_per_sample, frames_per_buffer, channels, effects;
39 std::string mic_positions;
38 40
39 if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) || 41 if (!ReadParam(m, iter, &format) || !ReadParam(m, iter, &channel_layout) ||
40 !ReadParam(m, iter, &sample_rate) || 42 !ReadParam(m, iter, &sample_rate) ||
41 !ReadParam(m, iter, &bits_per_sample) || 43 !ReadParam(m, iter, &bits_per_sample) ||
42 !ReadParam(m, iter, &frames_per_buffer) || 44 !ReadParam(m, iter, &frames_per_buffer) ||
43 !ReadParam(m, iter, &channels) || !ReadParam(m, iter, &effects)) { 45 !ReadParam(m, iter, &channels) || !ReadParam(m, iter, &effects) ||
46 !ReadParam(m, iter, &mic_positions)) {
44 return false; 47 return false;
45 } 48 }
46 49
47 AudioParameters params(format, channel_layout, channels, sample_rate, 50 AudioParameters params(format, channels, channel_layout, sample_rate,
48 bits_per_sample, frames_per_buffer, effects); 51 bits_per_sample, frames_per_buffer, mic_positions,
52 effects);
49 *r = params; 53 *r = params;
50 return r->IsValid(); 54 return r->IsValid();
51 } 55 }
52 56
53 void ParamTraits<AudioParameters>::Log(const AudioParameters& p, 57 void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
54 std::string* l) { 58 std::string* l) {
55 l->append(base::StringPrintf("<AudioParameters>")); 59 l->append(base::StringPrintf("<AudioParameters>"));
56 } 60 }
57 61
58 void ParamTraits<VideoCaptureFormat>::Write(Message* m, 62 void ParamTraits<VideoCaptureFormat>::Write(Message* m,
(...skipping 16 matching lines...) Expand all
75 return r->IsValid(); 79 return r->IsValid();
76 } 80 }
77 81
78 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p, 82 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
79 std::string* l) { 83 std::string* l) {
80 l->append(base::StringPrintf("<VideoCaptureFormat> %s", 84 l->append(base::StringPrintf("<VideoCaptureFormat> %s",
81 media::VideoCaptureFormat::ToString(p).c_str())); 85 media::VideoCaptureFormat::ToString(p).c_str()));
82 } 86 }
83 87
84 } 88 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698