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

Side by Side Diff: media/base/channel_layout.h

Issue 645853011: Fix errors in comments. Make comments match code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use DCHECK_EQ Created 6 years, 1 month 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
« no previous file with comments | « no previous file | media/base/channel_layout.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_BASE_CHANNEL_LAYOUT_H_ 5 #ifndef MEDIA_BASE_CHANNEL_LAYOUT_H_
6 #define MEDIA_BASE_CHANNEL_LAYOUT_H_ 6 #define MEDIA_BASE_CHANNEL_LAYOUT_H_
7 7
8 #include "media/base/media_export.h" 8 #include "media/base/media_export.h"
9 9
10 namespace media { 10 namespace media {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 LEFT_OF_CENTER, 119 LEFT_OF_CENTER,
120 RIGHT_OF_CENTER, 120 RIGHT_OF_CENTER,
121 BACK_CENTER, 121 BACK_CENTER,
122 SIDE_LEFT, 122 SIDE_LEFT,
123 SIDE_RIGHT, 123 SIDE_RIGHT,
124 CHANNELS_MAX = SIDE_RIGHT, // Must always equal the largest value ever logged. 124 CHANNELS_MAX = SIDE_RIGHT, // Must always equal the largest value ever logged.
125 }; 125 };
126 126
127 // Returns the expected channel position in an interleaved stream. Values of -1 127 // Returns the expected channel position in an interleaved stream. Values of -1
128 // mean the channel at that index is not used for that layout. Values range 128 // mean the channel at that index is not used for that layout. Values range
129 // from 0 to CHANNELS_MAX - 1. 129 // from 0 to ChannelLayoutToChannelCount(layout) - 1.
130 MEDIA_EXPORT int ChannelOrder(ChannelLayout layout, Channels channel); 130 MEDIA_EXPORT int ChannelOrder(ChannelLayout layout, Channels channel);
131 131
132 // Returns the number of channels in a given ChannelLayout. 132 // Returns the number of channels in a given ChannelLayout.
133 MEDIA_EXPORT int ChannelLayoutToChannelCount(ChannelLayout layout); 133 MEDIA_EXPORT int ChannelLayoutToChannelCount(ChannelLayout layout);
134 134
135 // Given the number of channels, return the best layout, 135 // Given the number of channels, return the best layout,
136 // or return CHANNEL_LAYOUT_UNSUPPORTED if there is no good match. 136 // or return CHANNEL_LAYOUT_UNSUPPORTED if there is no good match.
137 MEDIA_EXPORT ChannelLayout GuessChannelLayout(int channels); 137 MEDIA_EXPORT ChannelLayout GuessChannelLayout(int channels);
138 138
139 // Returns a string representation of the channel layout. 139 // Returns a string representation of the channel layout.
140 MEDIA_EXPORT const char* ChannelLayoutToString(ChannelLayout layout); 140 MEDIA_EXPORT const char* ChannelLayoutToString(ChannelLayout layout);
141 141
142 } // namespace media 142 } // namespace media
143 143
144 #endif // MEDIA_BASE_CHANNEL_LAYOUT_H_ 144 #endif // MEDIA_BASE_CHANNEL_LAYOUT_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/channel_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698