diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index b18e324731273..075da338cb391 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -898,13 +898,6 @@ public interface AudioColumns extends MediaColumns { * @hide */ public static final String ALBUM_ARTIST = "album_artist"; - - /** - * Whether the song is part of a compilation - *

Type: TEXT

- * @hide - */ - public static final String COMPILATION = "compilation"; /** * A non human readable key calculated from the ARTIST, used for diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index 0c9f4957f5359..dbbcc49dfc39a 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -56,7 +56,6 @@ 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 c0ff9d29d32b9..29bfc4aaf5885 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -73,7 +73,6 @@ enum { kKeyDiscNumber = 'dnum', // cstring kKeyDate = 'date', // cstring kKeyWriter = 'writ', // cstring - kKeyCompilation = 'cpil', // cstring kKeyTimeScale = 'tmsl', // int32_t // video profile and level diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java index ce1f2cf810d66..681751b4d1511 100644 --- a/media/java/android/media/MediaMetadataRetriever.java +++ b/media/java/android/media/MediaMetadataRetriever.java @@ -258,6 +258,5 @@ protected void finalize() throws Throwable { public static final int METADATA_KEY_MIMETYPE = 22; public static final int METADATA_KEY_DISCNUMBER = 23; public static final int METADATA_KEY_ALBUMARTIST = 24; - public static final int METADATA_KEY_COMPILATION = 25; // Add more here... } diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index bfa8f66201f1a..82c04265e407d 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -743,7 +743,6 @@ sp MP3Extractor::getMetaData() { { kKeyAuthor, "TXT", "TEXT" }, { kKeyCDTrackNumber, "TRK", "TRCK" }, { kKeyDiscNumber, "TPA", "TPOS" }, - { kKeyCompilation, "TCP", "TCMP" }, }; static const size_t kNumMapEntries = sizeof(kMap) / sizeof(kMap[0]); diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index b6ddfbd5a6727..2154f2f5fc69c 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1176,17 +1176,6 @@ status_t MPEG4Extractor::parseMetaData(off_t offset, size_t size) { metadataKey = kKeyGenre; break; } - case FOURCC('c', 'p', 'i', 'l'): - { - if (size == 9 && flags == 21) { - char tmp[16]; - sprintf(tmp, "%d", - (int)buffer[size-1]); - - mFileMetaData->setCString(kKeyCompilation, tmp); - } - break; - } case FOURCC('t', 'r', 'k', 'n'): { if (size == 16 && flags == 0) { diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp index 12f2cf732fd2b..e81dc139ce5cb 100644 --- a/media/libstagefright/OggExtractor.cpp +++ b/media/libstagefright/OggExtractor.cpp @@ -663,7 +663,6 @@ void MyVorbisExtractor::parseFileMetaData() { { "ALBUM", kKeyAlbum }, { "ALBUMARTIST", kKeyAlbumArtist }, { "ALBUM ARIST", kKeyAlbumArtist }, - { "COMPILATION", kKeyCompilation }, { "COMPOSER", kKeyComposer }, { "GENRE", kKeyGenre }, { "AUTHOR", kKeyAuthor }, diff --git a/media/libstagefright/StagefrightMediaScanner.cpp b/media/libstagefright/StagefrightMediaScanner.cpp index 447e11740e383..4ffe925d1f253 100755 --- a/media/libstagefright/StagefrightMediaScanner.cpp +++ b/media/libstagefright/StagefrightMediaScanner.cpp @@ -229,7 +229,6 @@ status_t StagefrightMediaScanner::processFile( { "year", METADATA_KEY_YEAR }, { "duration", METADATA_KEY_DURATION }, { "writer", METADATA_KEY_WRITER }, - { "compilation", METADATA_KEY_COMPILATION }, }; static const size_t kNumEntries = sizeof(kKeyMap) / sizeof(kKeyMap[0]); diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index d8b1a6ceb477f..9b2dec9b389a3 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -355,7 +355,6 @@ void StagefrightMetadataRetriever::parseMetaData() { { kKeyTitle, METADATA_KEY_TITLE }, { kKeyYear, METADATA_KEY_YEAR }, { kKeyWriter, METADATA_KEY_WRITER }, - { kKeyCompilation, METADATA_KEY_COMPILATION }, }; static const size_t kNumMapEntries = sizeof(kMap) / sizeof(kMap[0]);