diff options
| author | Marcos Marado <mmarado@cyngn.com> | 2016-04-19 15:13:42 -0700 |
|---|---|---|
| committer | Scott Mertz <scott@cyngn.com> | 2016-04-20 08:45:54 -0700 |
| commit | 6060ede5605579bf674c6d2f397f09de91e76b50 (patch) | |
| tree | 7b43b926b858bd22806473885bc8ce9df820d4bf | |
| parent | 20f4efad8f9e863139db8256337f833637329a16 (diff) | |
| download | android_hardware_qcom_media-6060ede5605579bf674c6d2f397f09de91e76b50.tar.gz android_hardware_qcom_media-6060ede5605579bf674c6d2f397f09de91e76b50.tar.bz2 android_hardware_qcom_media-6060ede5605579bf674c6d2f397f09de91e76b50.zip | |
mm-core: Don't conflict with existing metadata definitions
Change-Id: I760f8c9fc71171e63f9da87b69cd044dcb03e91b
| -rw-r--r-- | mm-core/inc/QCMetaData.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm-core/inc/QCMetaData.h b/mm-core/inc/QCMetaData.h index 5990637f..c137a81d 100644 --- a/mm-core/inc/QCMetaData.h +++ b/mm-core/inc/QCMetaData.h @@ -36,6 +36,7 @@ namespace android { enum { kKeyAacCodecSpecificData = 'nacc' , // for native aac files +#ifndef META_DATA_H_ kKeyRawCodecSpecificData = 'rcsd', // raw data - added to support mmParser kKeyDivXVersion = 'DivX', // int32_t kKeyDivXDrm = 'QDrm', // void * @@ -47,6 +48,7 @@ enum { kKeyWMAFormatTag = 'fmtt', // int64_t kKeyWMABitspersample = 'bsps', // int64_t kKeyWMAVirPktSize = 'vpks', // int64_t +#endif kKeyWMAChannelMask = 'chmk', // int32_t kKeyVorbisData = 'vdat', // raw data @@ -79,6 +81,7 @@ enum { kKeyUseSetBuffers = 'setb', //bool (int32_t) }; +#ifndef META_DATA_H_ enum { kTypeDivXVer_3_11, kTypeDivXVer_4, @@ -90,6 +93,7 @@ enum { kTypeWMAPro, kTypeWMALossLess, }; +#endif //This enum should be keep in sync with "enum Flags" in MediaExtractor.h in AOSP, //Value should reflect as last entry in the enum |