summaryrefslogtreecommitdiffstats
path: root/media/tests
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2010-01-25 20:49:08 -0800
committerYu Shan Emily Lau <yslau@google.com>2010-01-25 20:49:08 -0800
commiteea6ecdfce33178cee3c4b20fe230d659421e72c (patch)
tree6040ea1462a45c4a3e801deed4498fd8a1bd0823 /media/tests
parent96949efc541fb2efd8a7d359ca8461d34ea8eb8c (diff)
downloadframeworks_base-eea6ecdfce33178cee3c4b20fe230d659421e72c.zip
frameworks_base-eea6ecdfce33178cee3c4b20fe230d659421e72c.tar.gz
frameworks_base-eea6ecdfce33178cee3c4b20fe230d659421e72c.tar.bz2
Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different.
Diffstat (limited to 'media/tests')
-rwxr-xr-xmedia/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java1
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
index 5127255..6087268 100755
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
@@ -274,6 +274,7 @@ public class MediaNames {
//video thumbnail
public static final String THUMBNAIL_OUTPUT = "/sdcard/media_api/videoThumbnail.png";
public static final String GOLDEN_THUMBNAIL_OUTPUT = "/sdcard/media_api/goldenThumbnail.png";
+ public static final String GOLDEN_THUMBNAIL_OUTPUT_2 = "/sdcard/media_api/goldenThumbnail2.png";
//Metadata Utility
public static final String[] THUMBNAIL_CAPTURE_TEST_FILES = {
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
index 4e30f91..ee6067a 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
@@ -420,7 +420,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra
@LargeTest
public void testGetThumbnail() throws Exception {
- boolean getThumbnail = CodecTest.getThumbnail(MediaNames.VIDEO_H264_AAC, MediaNames.GOLDEN_THUMBNAIL_OUTPUT);
+ boolean getThumbnail = CodecTest.getThumbnail(MediaNames.VIDEO_H264_AAC, MediaNames.GOLDEN_THUMBNAIL_OUTPUT_2);
assertTrue("Get Thumbnail", getThumbnail);
}