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

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

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix naming collision Created 6 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
« no previous file with comments | « media/base/pipeline_status.h ('k') | media/base/sample_format.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SAMPLE_FORMAT_H 5 #ifndef MEDIA_BASE_SAMPLE_FORMAT_H
6 #define MEDIA_BASE_SAMPLE_FORMAT_H 6 #define MEDIA_BASE_SAMPLE_FORMAT_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 {
11 11
12 enum SampleFormat { 12 enum SampleFormat {
13 // These values are histogrammed over time; do not change their ordinal 13 // These values are histogrammed over time; do not change their ordinal
14 // values. When deleting a sample format replace it with a dummy value; when 14 // values. When deleting a sample format replace it with a dummy value; when
15 // adding a sample format, do so at the bottom before kSampleFormatMax. 15 // adding a sample format, do so at the bottom before kSampleFormatMax, and
16 // update the value of kSampleFormatMax.
16 kUnknownSampleFormat = 0, 17 kUnknownSampleFormat = 0,
17 kSampleFormatU8, // Unsigned 8-bit w/ bias of 128. 18 kSampleFormatU8, // Unsigned 8-bit w/ bias of 128.
18 kSampleFormatS16, // Signed 16-bit. 19 kSampleFormatS16, // Signed 16-bit.
19 kSampleFormatS32, // Signed 32-bit. 20 kSampleFormatS32, // Signed 32-bit.
20 kSampleFormatF32, // Float 32-bit. 21 kSampleFormatF32, // Float 32-bit.
21 kSampleFormatPlanarS16, // Signed 16-bit planar. 22 kSampleFormatPlanarS16, // Signed 16-bit planar.
22 kSampleFormatPlanarF32, // Float 32-bit planar. 23 kSampleFormatPlanarF32, // Float 32-bit planar.
23 24
24 // Must always be last! 25 // Must always be equal to largest value ever logged.
25 kSampleFormatMax 26 kSampleFormatMax = kSampleFormatPlanarF32,
26 }; 27 };
27 28
28 // Returns the number of bytes used per channel for the specified 29 // Returns the number of bytes used per channel for the specified
29 // |sample_format|. 30 // |sample_format|.
30 MEDIA_EXPORT int SampleFormatToBytesPerChannel(SampleFormat sample_format); 31 MEDIA_EXPORT int SampleFormatToBytesPerChannel(SampleFormat sample_format);
31 32
32 // Returns the name of the sample format as a string 33 // Returns the name of the sample format as a string
33 MEDIA_EXPORT const char* SampleFormatToString(SampleFormat sample_format); 34 MEDIA_EXPORT const char* SampleFormatToString(SampleFormat sample_format);
34 35
35 } // namespace media 36 } // namespace media
36 37
37 #endif // MEDIA_BASE_SAMPLE_FORMAT_H 38 #endif // MEDIA_BASE_SAMPLE_FORMAT_H
OLDNEW
« no previous file with comments | « media/base/pipeline_status.h ('k') | media/base/sample_format.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698