diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2010-01-27 10:28:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-27 10:28:51 -0800 |
| commit | a6f266ca5789501144b317aed0782d592dd2d023 (patch) | |
| tree | 02a6f98cb2ed245e34042543570c308e84b59d3d /media | |
| parent | aeb4126736c1b93abe5252e1723c568a13da7c81 (diff) | |
| parent | eea6ecdfce33178cee3c4b20fe230d659421e72c (diff) | |
| download | frameworks_base-a6f266ca5789501144b317aed0782d592dd2d023.zip frameworks_base-a6f266ca5789501144b317aed0782d592dd2d023.tar.gz frameworks_base-a6f266ca5789501144b317aed0782d592dd2d023.tar.bz2 | |
Merge "Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different."
Diffstat (limited to 'media')
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); } |