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

Commit 99588d59 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 1e495da1: Merge change I4b03c2cd into eclair 

Merge commit '1e495da1' into eclair-mr2

* commit '1e495da1':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
parents 571529f8 1e495da1

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

+8 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.test.suitebuilder.annotation.Suppress; 
import android.util.Log;



import com.android.mediaframeworktest.MediaNames;

import com.android.mediaframeworktest.MediaProfileReader;

/**

 * This metadata test suite test the basic functionality of the 

 * MediaMetadataRetriever
@@ -193,12 +194,17 @@ public class MediaMetadataTest extends AndroidTestCase { 
    }

     

    private static void validateMetatData(int fileIndex, String meta_data_file[][]) {

        Log.v(TAG, "filePath = "+ meta_data_file[fileIndex][0]);

        if ((meta_data_file[fileIndex][0].endsWith("wma") && !MediaProfileReader.getWMAEnable()) ||

            (meta_data_file[fileIndex][0].endsWith("wmv") && !MediaProfileReader.getWMVEnable())) {

            Log.v(TAG, "Skip test since windows media is not supported");

            return;

        }

        String value = null;

        MediaMetadataRetriever retriever = new MediaMetadataRetriever();

        retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);

        try {

            retriever.setDataSource(meta_data_file[fileIndex][0]);

            Log.v(TAG, "filePath = "+ meta_data_file[fileIndex][0]);

        } catch(Exception e) {

            Log.v(TAG, "Failed: "+meta_data_file[fileIndex][0] + " " + e.toString());

            //Set the test case failure whenever it failed to setDataSource

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

+4 −2
Original line number Diff line number Diff line
@@ -242,9 +242,11 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
    

    @LargeTest

    public void testWMA9SetLooping() throws Exception {

      if (isWMAEnable) {

        boolean isLoop = CodecTest.setLooping(MediaNames.WMA9);

        assertTrue("WMA9 setLooping", isLoop);

      }

    }

    

    @LargeTest

    public void testAMRSetLooping() throws Exception {