Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f266ca authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android (Google) Code Review
Browse files

Merge "Add the new golden thumbnail image as the PV and stagefright... 

Merge "Add the new golden thumbnail image as the PV and stagefright implementations in capturing thumbnail is different."
parents aeb41267 eea6ecdf

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);         

    }