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

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

Issue 12662038: Revert 187936 "Pass more detailed audio hardware configuration i..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1440/src/
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « content/common/media/media_param_traits.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "media/audio/audio_parameters.h" 8 #include "media/audio/audio_parameters.h"
9 #include "media/base/limits.h" 9 #include "media/base/limits.h"
10 #include "media/video/capture/video_capture_types.h" 10 #include "media/video/capture/video_capture_types.h"
(...skipping 24 matching lines...) Expand all
35 35
36 if (!m->ReadInt(iter, &format) || 36 if (!m->ReadInt(iter, &format) ||
37 !m->ReadInt(iter, &channel_layout) || 37 !m->ReadInt(iter, &channel_layout) ||
38 !m->ReadInt(iter, &sample_rate) || 38 !m->ReadInt(iter, &sample_rate) ||
39 !m->ReadInt(iter, &bits_per_sample) || 39 !m->ReadInt(iter, &bits_per_sample) ||
40 !m->ReadInt(iter, &frames_per_buffer) || 40 !m->ReadInt(iter, &frames_per_buffer) ||
41 !m->ReadInt(iter, &channels) || 41 !m->ReadInt(iter, &channels) ||
42 !m->ReadInt(iter, &input_channels)) 42 !m->ReadInt(iter, &input_channels))
43 return false; 43 return false;
44 r->Reset(static_cast<AudioParameters::Format>(format), 44 r->Reset(static_cast<AudioParameters::Format>(format),
45 static_cast<ChannelLayout>(channel_layout), channels, 45 static_cast<ChannelLayout>(channel_layout), input_channels,
46 input_channels, sample_rate, bits_per_sample, frames_per_buffer); 46 sample_rate, bits_per_sample, frames_per_buffer);
47 if (!r->IsValid()) 47 if (!r->IsValid())
48 return false; 48 return false;
49 return true; 49 return true;
50 } 50 }
51 51
52 void ParamTraits<AudioParameters>::Log(const AudioParameters& p, 52 void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
53 std::string* l) { 53 std::string* l) {
54 l->append(base::StringPrintf("<AudioParameters>")); 54 l->append(base::StringPrintf("<AudioParameters>"));
55 } 55 }
56 56
(...skipping 29 matching lines...) Expand all
86 86
87 return true; 87 return true;
88 } 88 }
89 89
90 void ParamTraits<VideoCaptureParams>::Log(const VideoCaptureParams& p, 90 void ParamTraits<VideoCaptureParams>::Log(const VideoCaptureParams& p,
91 std::string* l) { 91 std::string* l) {
92 l->append(base::StringPrintf("<VideoCaptureParams>")); 92 l->append(base::StringPrintf("<VideoCaptureParams>"));
93 } 93 }
94 94
95 } 95 }
OLDNEW
« no previous file with comments | « content/common/media/media_param_traits.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698