diff options
| author | Marco Nelissen <marcone@google.com> | 2011-01-06 11:12:17 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2011-01-07 12:42:07 -0800 |
| commit | ee35aff74494e6c0b718e219427af6a6c573b928 (patch) | |
| tree | 4e67db5f8013c5430b1cfb435469c90aabdb7199 /include/media | |
| parent | ccdf3853b505f56a8bc52ee038dfe07aa87eb088 (diff) | |
| download | frameworks_base-ee35aff74494e6c0b718e219427af6a6c573b928.zip frameworks_base-ee35aff74494e6c0b718e219427af6a6c573b928.tar.gz frameworks_base-ee35aff74494e6c0b718e219427af6a6c573b928.tar.bz2 | |
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/3311831
(cherry-picked from GB because of weird automerger failure)
Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/mediametadataretriever.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index ed54b37..03dd52d 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -56,6 +56,7 @@ enum { METADATA_KEY_MIMETYPE = 22, METADATA_KEY_DISC_NUMBER = 23, METADATA_KEY_ALBUMARTIST = 24, + METADATA_KEY_COMPILATION = 25, // Add more here... }; diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 5f33739..5170a2c 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -80,6 +80,7 @@ enum { kKeyDiscNumber = 'dnum', // cstring kKeyDate = 'date', // cstring kKeyWriter = 'writ', // cstring + kKeyCompilation = 'cpil', // cstring kKeyTimeScale = 'tmsl', // int32_t // video profile and level |