diff options
| author | Marco Nelissen <marcone@google.com> | 2020-07-14 20:56:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-14 20:56:23 +0000 |
| commit | 180d021bfc5185b484aafffa4db82b8085b6fb25 (patch) | |
| tree | dd2cb01c737731fe3e80fa70541ed26692d52938 | |
| parent | 2d982f20772cccd0e13f3e90a819947d92f1018e (diff) | |
| parent | f440a29be1e8bf61650c806d0e4ebc1f4a26581e (diff) | |
| download | cts-180d021bfc5185b484aafffa4db82b8085b6fb25.tar.gz | |
Merge "Revert "Test for composer and other tags in mp4"" into rvc-dev
| -rw-r--r-- | tests/tests/media/res/raw/tags.mp4 | bin | 5525 -> 0 bytes | |||
| -rw-r--r-- | tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java | 25 |
2 files changed, 0 insertions, 25 deletions
diff --git a/tests/tests/media/res/raw/tags.mp4 b/tests/tests/media/res/raw/tags.mp4 Binary files differdeleted file mode 100644 index 4e7dc434cef..00000000000 --- a/tests/tests/media/res/raw/tags.mp4 +++ /dev/null diff --git a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java index 79a68181a9d..48208d9f63e 100644 --- a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java +++ b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java @@ -380,31 +380,6 @@ public class MediaMetadataRetrieverTest extends AndroidTestCase { mRetriever.getEmbeddedPicture()); } - public void testMp4Metadata() { - setDataSourceFd(R.raw.tags); - assertEquals("Wrong title", - "the title", - mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE)); - assertEquals("Wrong artist", - "the artist", - mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST)); - assertEquals("Wrong album", - "the album", - mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUM)); - assertEquals("Wrong album artist", - "the album artist", - mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST)); - assertEquals("Wrong composer", - "the composer", - mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_COMPOSER)); - assertEquals("Wrong genre", - "custom genre", - mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_GENRE)); - assertEquals("Wrong year", - "2020", - mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_YEAR)); - } - public void testMp4AlbumArt() { setDataSourceFd(R.raw.swirl_128x128_h264_albumart); assertEquals("Mime type was other than expected", |