diff options
author | Marco Nelissen <marcone@google.com> | 2011-01-06 20:29:11 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-06 20:29:11 -0800 |
commit | d1da80a4b3d50c1be120b0e873363da711428a81 (patch) | |
tree | 1dc4872a7cb9ec8c46596520f71f6b88cd6e709d /include | |
parent | 240cf3d17e40c012eb4a830d60f4a6a3607373f0 (diff) | |
parent | ba77a3f9cb1d68b2ed4813aaae856444578e3a75 (diff) | |
download | frameworks_base-d1da80a4b3d50c1be120b0e873363da711428a81.zip frameworks_base-d1da80a4b3d50c1be120b0e873363da711428a81.tar.gz frameworks_base-d1da80a4b3d50c1be120b0e873363da711428a81.tar.bz2 |
am ba77a3f9: 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
* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
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
Diffstat (limited to 'include')
-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 dbbcc49..ddc07f6 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 a69d9af..ea2fa52 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -75,6 +75,7 @@ enum { kKeyDiscNumber = 'dnum', // cstring kKeyDate = 'date', // cstring kKeyWriter = 'writ', // cstring + kKeyCompilation = 'cpil', // cstring kKeyTimeScale = 'tmsl', // int32_t // video profile and level |