commit a1320b2fc4cb477483bfc5fe3920cbab113e3882
author younghoon.im <younghoon.im@lge.com> Fri Nov 17 12:19:49 2023 +0900
committer Younghoon Im <younghoon.im@lge.com> Thu Dec 14 18:00:11 2023 +0000
tree 6196266dcf54ad678959bf12a14c79f8ff1549bb
parent f2785dffdd0f1b355b5b2fb4e3a89f118fd99227

Skip the test when the resource is not playbale

Some codecs come enabled by default, However it may vary depending on OEM's configuration.
So We skip the test when the resource is not playbale.

Bug: 280374601
Bug: 312122081
Test: cts-src CtsMediaTestCases:MediaPlayerTest
Test: cts-src CtsMediaTestCases:MediaPlayerSurfaceTest#testSetSurface
Merged-In: I20aaf7543e67afff9df76552bde55b2191bf34a1
Change-Id: I6096f5a14d5a317798ec033b883c971a5d801b1f

tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java

diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
index aad69d9..20e3633e 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceStubActivity.java
@@ -24,6 +24,8 @@
 import android.platform.test.annotations.AppModeFull;
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -42,13 +44,17 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        String filePath = mInpPrefix + "testvideo.3gp";
         mResources = getResources();
         mMediaPlayer = new MediaPlayer();
         AssetFileDescriptor afd = null;
 
-        Preconditions.assertTestFileExists(mInpPrefix + "testvideo.3gp");
+        Preconditions.assertTestFileExists(filePath);
+        if (!MediaUtils.hasCodecsForResource(filePath)) {
+            return;
+        }
         try {
-            File inpFile = new File(mInpPrefix + "testvideo.3gp");
+            File inpFile = new File(filePath);
             ParcelFileDescriptor parcelFD =
                     ParcelFileDescriptor.open(inpFile, ParcelFileDescriptor.MODE_READ_ONLY);
             afd = new AssetFileDescriptor(parcelFD, 0, parcelFD.getStatSize());
@@ -74,11 +80,15 @@
     @Override
     protected void onResume() {
         super.onResume();
-        mVideoView.onResume();
+        if (mVideoView != null) {
+            mVideoView.onResume();
+        }
     }
 
     public void playVideo() throws Exception {
-        mVideoView.startTest();
+        if (mVideoView != null) {
+            mVideoView.startTest();
+        }
     }
 
 }

tests/tests/media/src/android/media/cts/MediaPlayerTest.java

diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index cbdc25b..14a9e39 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -296,6 +296,9 @@
     public void testPlayAudio(final String res,
             int mp3Duration, int tolerance, int seekDuration) throws Exception {
         Preconditions.assertTestFileExists(mInpPrefix + res);
+        if (!MediaUtils.hasCodecsForResource(mInpPrefix + res)) {
+            return;
+        }
         MediaPlayer mp = MediaPlayer.create(mContext, Uri.fromFile(new File(mInpPrefix + res)));
         try {
             mp.setAudioStreamType(AudioManager.STREAM_MUSIC);