Index: media/mp4/fourccs.h |
diff --git a/media/mp4/fourccs.h b/media/mp4/fourccs.h |
index 8092ddad77d5ebcc5ec00691dd9a6c5b4226f2d1..a986f34846fc2e5fd3f6dce2d0e37b383fe173ad 100644 |
--- a/media/mp4/fourccs.h |
+++ b/media/mp4/fourccs.h |
@@ -32,7 +32,9 @@ enum FourCC { |
FOURCC_MDAT = 0x6d646174, |
FOURCC_MDHD = 0x6d646864, |
FOURCC_MDIA = 0x6d646961, |
+ FOURCC_MECO = 0x6d65636f, |
FOURCC_MEHD = 0x6d656864, |
+ FOURCC_META = 0x6d657461, |
FOURCC_MFHD = 0x6d666864, |
FOURCC_MFRA = 0x6d667261, |
FOURCC_MINF = 0x6d696e66, |
@@ -43,6 +45,8 @@ enum FourCC { |
FOURCC_MVEX = 0x6d766578, |
FOURCC_MVHD = 0x6d766864, |
FOURCC_PASP = 0x70617370, |
+ FOURCC_PDIN = 0x7064696e, |
+ FOURCC_PRFT = 0x70726674, |
FOURCC_PSSH = 0x70737368, |
FOURCC_SAIO = 0x7361696f, |
FOURCC_SAIZ = 0x7361697a, |
@@ -54,6 +58,7 @@ enum FourCC { |
FOURCC_SKIP = 0x736b6970, |
FOURCC_SMHD = 0x736d6864, |
FOURCC_SOUN = 0x736f756e, |
+ FOURCC_SSIX = 0x73736978, |
FOURCC_STBL = 0x7374626c, |
FOURCC_STCO = 0x7374636f, |
FOURCC_STSC = 0x73747363, |
@@ -75,11 +80,6 @@ enum FourCC { |
FOURCC_VIDE = 0x76696465, |
FOURCC_VMHD = 0x766d6864, |
FOURCC_WIDE = 0x77696465, |
- |
- // The following are used for testing |
- FOURCC_CHLD = 0x63686c64, |
- FOURCC_MPTY = 0x6d707479, |
- FOURCC_TEST = 0x74657374, |
}; |
const inline std::string FourCCToString(FourCC fourcc) { |