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

Side by Side Diff: media/audio/audio_parameters.h

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | « media/audio/audio_output_proxy_unittest.cc ('k') | media/audio/audio_parameters.cc » ('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 #ifndef MEDIA_AUDIO_AUDIO_PARAMETERS_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_PARAMETERS_H_
6 #define MEDIA_AUDIO_AUDIO_PARAMETERS_H_ 6 #define MEDIA_AUDIO_AUDIO_PARAMETERS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "media/base/channel_layout.h" 9 #include "media/base/channel_layout.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
11 11
12 namespace media {
13
14 struct MEDIA_EXPORT AudioInputBufferParameters { 12 struct MEDIA_EXPORT AudioInputBufferParameters {
15 double volume; 13 double volume;
16 uint32 size; 14 uint32 size;
17 }; 15 };
18 16
19 // Use a struct-in-struct approach to ensure that we can calculate the required 17 // Use a struct-in-struct approach to ensure that we can calculate the required
20 // size as sizeof(AudioInputBufferParameters) + #(bytes in audio buffer) without 18 // size as sizeof(AudioInputBufferParameters) + #(bytes in audio buffer) without
21 // using packing. 19 // using packing.
22 struct MEDIA_EXPORT AudioInputBuffer { 20 struct MEDIA_EXPORT AudioInputBuffer {
23 AudioInputBufferParameters params; 21 AudioInputBufferParameters params;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 Format format_; // Format of the stream. 76 Format format_; // Format of the stream.
79 ChannelLayout channel_layout_; // Order of surround sound channels. 77 ChannelLayout channel_layout_; // Order of surround sound channels.
80 int sample_rate_; // Sampling frequency/rate. 78 int sample_rate_; // Sampling frequency/rate.
81 int bits_per_sample_; // Number of bits per sample. 79 int bits_per_sample_; // Number of bits per sample.
82 int frames_per_buffer_; // Number of frames in a buffer. 80 int frames_per_buffer_; // Number of frames in a buffer.
83 81
84 int channels_; // Number of channels. Value set based on 82 int channels_; // Number of channels. Value set based on
85 // |channel_layout|. 83 // |channel_layout|.
86 }; 84 };
87 85
88 } // namespace media
89
90 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_ 86 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_
OLDNEW
« no previous file with comments | « media/audio/audio_output_proxy_unittest.cc ('k') | media/audio/audio_parameters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698