| Index: media/base/sample_format.cc
|
| diff --git a/media/base/sample_format.cc b/media/base/sample_format.cc
|
| index 0ee7f5e17b788c73ae6620321788047f1fd03387..3aa41762463127db227600f2107ef2f093023aef 100644
|
| --- a/media/base/sample_format.cc
|
| +++ b/media/base/sample_format.cc
|
| @@ -13,6 +13,8 @@ int SampleFormatToBytesPerChannel(SampleFormat sample_format) {
|
| case kUnknownSampleFormat:
|
| return 0;
|
| case kSampleFormatU8:
|
| + case kSampleFormatBitstreamAc3:
|
| + case kSampleFormatBitstreamEac3:
|
| return 1;
|
| case kSampleFormatS16:
|
| case kSampleFormatPlanarS16:
|
| @@ -49,6 +51,10 @@ const char* SampleFormatToString(SampleFormat sample_format) {
|
| return "Float 32-bit planar";
|
| case kSampleFormatPlanarS32:
|
| return "Signed 32-bit planar";
|
| + case kSampleFormatBitstreamAc3:
|
| + return "Compressed AC3 bitstream";
|
| + case kSampleFormatBitstreamEac3:
|
| + return "Compressed E-AC3 bitstream";
|
| }
|
| NOTREACHED() << "Invalid sample format provided: " << sample_format;
|
| return "";
|
| @@ -66,6 +72,8 @@ bool IsPlanar(SampleFormat sample_format) {
|
| case kSampleFormatS24:
|
| case kSampleFormatS32:
|
| case kSampleFormatF32:
|
| + case kSampleFormatBitstreamAc3:
|
| + case kSampleFormatBitstreamEac3:
|
| return false;
|
| }
|
|
|
| @@ -80,6 +88,8 @@ bool IsInterleaved(SampleFormat sample_format) {
|
| case kSampleFormatS24:
|
| case kSampleFormatS32:
|
| case kSampleFormatF32:
|
| + case kSampleFormatBitstreamAc3:
|
| + case kSampleFormatBitstreamEac3:
|
| return true;
|
| case kUnknownSampleFormat:
|
| case kSampleFormatPlanarS16:
|
| @@ -92,4 +102,25 @@ bool IsInterleaved(SampleFormat sample_format) {
|
| return false;
|
| }
|
|
|
| +bool IsCompressed(SampleFormat sample_format) {
|
| + switch (sample_format) {
|
| + case kSampleFormatBitstreamAc3:
|
| + case kSampleFormatBitstreamEac3:
|
| + return true;
|
| + case kUnknownSampleFormat:
|
| + case kSampleFormatU8:
|
| + case kSampleFormatS16:
|
| + case kSampleFormatS24:
|
| + case kSampleFormatS32:
|
| + case kSampleFormatF32:
|
| + case kSampleFormatPlanarS16:
|
| + case kSampleFormatPlanarF32:
|
| + case kSampleFormatPlanarS32:
|
| + return false;
|
| + }
|
| +
|
| + NOTREACHED() << "Invalid sample format provided: " << sample_format;
|
| + return false;
|
| +}
|
| +
|
| } // namespace media
|
|
|