diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
| commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
| tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /media/base/sample_format.h | |
| parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
| download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz | |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'media/base/sample_format.h')
| -rw-r--r-- | media/base/sample_format.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/base/sample_format.h b/media/base/sample_format.h index 3d2799fa12..7c3df70215 100644 --- a/media/base/sample_format.h +++ b/media/base/sample_format.h @@ -12,7 +12,8 @@ namespace media { enum SampleFormat { // These values are histogrammed over time; do not change their ordinal // values. When deleting a sample format replace it with a dummy value; when - // adding a sample format, do so at the bottom before kSampleFormatMax. + // adding a sample format, do so at the bottom before kSampleFormatMax, and + // update the value of kSampleFormatMax. kUnknownSampleFormat = 0, kSampleFormatU8, // Unsigned 8-bit w/ bias of 128. kSampleFormatS16, // Signed 16-bit. @@ -21,8 +22,8 @@ enum SampleFormat { kSampleFormatPlanarS16, // Signed 16-bit planar. kSampleFormatPlanarF32, // Float 32-bit planar. - // Must always be last! - kSampleFormatMax + // Must always be equal to largest value ever logged. + kSampleFormatMax = kSampleFormatPlanarF32, }; // Returns the number of bytes used per channel for the specified |