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

Unified Diff: media/base/sample_format.cc

Issue 2503233003: Add enumerations for compressed (E)AC3 sample format (Closed)
Patch Set: Fix proto Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/sample_format.h ('k') | media/remoting/proto/remoting_rpc_message.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/sample_format.cc
diff --git a/media/base/sample_format.cc b/media/base/sample_format.cc
index 0ee7f5e17b788c73ae6620321788047f1fd03387..e6141a69b3600b6808cdc6a5e8939677ab0d4a0f 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 kSampleFormatAc3:
+ case kSampleFormatEac3:
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 kSampleFormatAc3:
+ return "Compressed AC3 bitstream";
+ case kSampleFormatEac3:
+ 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 kSampleFormatAc3:
+ case kSampleFormatEac3:
return false;
}
@@ -80,6 +88,8 @@ bool IsInterleaved(SampleFormat sample_format) {
case kSampleFormatS24:
case kSampleFormatS32:
case kSampleFormatF32:
+ case kSampleFormatAc3:
+ case kSampleFormatEac3:
return true;
case kUnknownSampleFormat:
case kSampleFormatPlanarS16:
@@ -92,4 +102,25 @@ bool IsInterleaved(SampleFormat sample_format) {
return false;
}
+bool IsBitstream(SampleFormat sample_format) {
+ switch (sample_format) {
+ case kSampleFormatAc3:
+ case kSampleFormatEac3:
+ 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
« no previous file with comments | « media/base/sample_format.h ('k') | media/remoting/proto/remoting_rpc_message.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698