check decode cap before runing mediastress playerTest
Change-Id: I521e09be487acded7e18e955552a60f8d2f29a7e
Signed-off-by: ywan171 <yi.a.wang@intel.com>
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java
index 93dbdbd..482aec9 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H263QcifLongPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
import com.android.cts.util.TimeoutReq;
public class H263QcifLongPlayerTest extends MediaPlayerStressTest {
@@ -28,10 +24,6 @@
"bbb_full.ffmpeg.176x144.3gp.h263_56kbps_12fps.libfaac_mono_24kbps_11025Hz.3gp"
};
- public H263QcifLongPlayerTest() {
- super(CamcorderProfile.QUALITY_QCIF, VideoEncoder.H263, AudioEncoder.AAC);
- }
-
@TimeoutReq(minutes = 11)
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H263QcifShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H263QcifShortPlayerTest.java
index 392a2c8..2035869 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H263QcifShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H263QcifShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H263QcifShortPlayerTest extends MediaPlayerStressTest {
private final static String VIDEO_PATH_MIDDLE = "bbb_short/176x144/3gp_h263_libfaac/";
private final String[] mMedias = {
@@ -49,10 +45,6 @@
"bbb_short.ffmpeg.176x144.3gp.h263_56kbps_25fps.libfaac_stereo_24kbps_22050Hz.3gp"
};
- public H263QcifShortPlayerTest() {
- super(CamcorderProfile.QUALITY_QCIF, VideoEncoder.H263, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacLongPlayerTest.java
index b7f7564..7216871 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacLongPlayerTest.java
@@ -16,20 +16,12 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R1080pAacLongPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_full/1920x1080/mp4_libx264_libfaac/";
private final String[] mMedias = {
"bbb_full.ffmpeg.1920x1080.mp4.libx264_10000kbps_30fps.libfaac_stereo_192kbps_48000Hz.mp4"
};
- public H264R1080pAacLongPlayerTest() {
- super(CamcorderProfile.QUALITY_1080P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacRepeatedPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacRepeatedPlayerTest.java
index db5d732..28e1158 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacRepeatedPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacRepeatedPlayerTest.java
@@ -16,20 +16,12 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R1080pAacRepeatedPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/1920x1080/mp4_libx264_libfaac/";
private final String[] mMedias = {
"bbb_short.ffmpeg.1920x1080.mp4.libx264_10000kbps_30fps.libfaac_stereo_192kbps_48000Hz.mp4",
};
- public H264R1080pAacRepeatedPlayerTest() {
- super(CamcorderProfile.QUALITY_1080P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackRepeated(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacShortPlayerTest.java
index 3b7da57..2e7d7ec 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R1080pAacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R1080pAacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/1920x1080/mp4_libx264_libfaac/";
private final String[] mMedias = {
@@ -28,10 +24,6 @@
"bbb_short.ffmpeg.1920x1080.mp4.libx264_5000kbps_30fps.libfaac_stereo_192kbps_48000Hz.mp4"
};
- public H264R1080pAacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_1080P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacLongPlayerTest.java
index f01aa75..3628d99 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacLongPlayerTest.java
@@ -16,20 +16,12 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R480pAacLongPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_full/720x480/mp4_libx264_libfaac/";
private final String[] mMedias = {
"bbb_full.ffmpeg.720x480.mp4.libx264_500kbps_25fps.libfaac_stereo_128kbps_44100Hz.mp4"
};
- public H264R480pAacLongPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacShortPlayerTest.java
index 81b80e5..ef01327 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R480pAacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R480pAacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/720x480/mp4_libx264_libfaac/";
private final String[] mMedias = {
@@ -37,10 +33,6 @@
"bbb_short.ffmpeg.720x480.mp4.libx264_500kbps_30fps.libfaac_stereo_192kbps_44100Hz.mp4"
};
- public H264R480pAacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R480x360AacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R480x360AacShortPlayerTest.java
index 6d0afea..12e8f6d 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R480x360AacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R480x360AacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R480x360AacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/480x360/mp4_libx264_libfaac/";
private final String[] mMedias = {
@@ -37,10 +33,6 @@
"bbb_short.ffmpeg.480x360.mp4.libx264_500kbps_30fps.libfaac_stereo_192kbps_44100Hz.mp4"
};
- public H264R480x360AacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacLongPlayerTest.java
index 3efec62..6a126fa 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacLongPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R720pAacLongPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_full/1280x720/mp4_libx264_libfaac/";
private final String[] mMedias = {
@@ -27,10 +23,6 @@
"bbb_full.ffmpeg.1280x720.mp4.libx264_1750kbps_30fps.libfaac_stereo_192kbps_48000Hz.mp4"
};
- public H264R720pAacLongPlayerTest() {
- super(CamcorderProfile.QUALITY_720P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacShortPlayerTest.java
index a6f162d..0fba0f3 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/H264R720pAacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class H264R720pAacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/1280x720/mp4_libx264_libfaac/";
private final String[] mMedias = {
@@ -38,10 +34,6 @@
"bbb_short.ffmpeg.1280x720.mp4.libx264_500kbps_30fps.libfaac_stereo_192kbps_44100Hz.mp4"
};
- public H264R720pAacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_720P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacLongPlayerTest.java
index e8a92e0..f396706 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacLongPlayerTest.java
@@ -16,20 +16,12 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR1080pAacLongPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_full/1920x1080/mp4_libx265_libfaac/";
private final String[] mMedias = {
"bbb_full.ffmpeg.1920x1080.mp4.libx265_6500kbps_30fps.libfaac_stereo_128kbps_48000Hz.mp4"
};
- public HEVCR1080pAacLongPlayerTest() {
- super(CamcorderProfile.QUALITY_1080P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacRepeatedPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacRepeatedPlayerTest.java
index 7ce3c3a..879ac6e 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacRepeatedPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacRepeatedPlayerTest.java
@@ -16,20 +16,12 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR1080pAacRepeatedPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/1920x1080/mp4_libx265_libfaac/";
private final String[] mMedias = {
"bbb_short.fmpeg.1920x1080.mp4.libx265_6500kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4",
};
- public HEVCR1080pAacRepeatedPlayerTest() {
- super(CamcorderProfile.QUALITY_1080P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackRepeated(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacShortPlayerTest.java
index 1d12b8c..eebe643 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR1080pAacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR1080pAacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/1920x1080/mp4_libx265_libfaac/";
private final String[] mMedias = {
@@ -28,10 +24,6 @@
"bbb_short.fmpeg.1920x1080.mp4.libx265_3250kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4"
};
- public HEVCR1080pAacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_1080P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacLongPlayerTest.java
index e54c51f..704a0d0 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacLongPlayerTest.java
@@ -16,20 +16,12 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR480pAacLongPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_full/720x480/mp4_libx265_libfaac/";
private final String[] mMedias = {
"bbb_full.ffmpeg.720x480.mp4.libx265_325kbps_24fps.libfaac_stereo_128kbps_48000Hz.mp4"
};
- public HEVCR480pAacLongPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacShortPlayerTest.java
index 2b64abd..d1ab245 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480pAacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR480pAacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/720x480/mp4_libx265_libfaac/";
private final String[] mMedias = {
@@ -31,10 +27,6 @@
"bbb_short.fmpeg.720x480.mp4.libx265_325kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4"
};
- public HEVCR480pAacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480x360AacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480x360AacShortPlayerTest.java
index 2099916..78139ce 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480x360AacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR480x360AacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR480x360AacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/480x360/mp4_libx265_libfaac/";
private final String[] mMedias = {
@@ -31,10 +27,6 @@
"bbb_short.fmpeg.480x360.mp4.libx265_325kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4"
};
- public HEVCR480x360AacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacLongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacLongPlayerTest.java
index 540f78a..bf6b787 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacLongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacLongPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR720pAacLongPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_full/1280x720/mp4_libx265_libfaac/";
private final String[] mMedias = {
@@ -27,10 +23,6 @@
"bbb_full.ffmpeg.1280x720.mp4.libx265_1140kbps_30fps.libfaac_stereo_128kbps_48000Hz.mp4"
};
- public HEVCR720pAacLongPlayerTest() {
- super(CamcorderProfile.QUALITY_720P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacShortPlayerTest.java
index dd93dfc..7c42e83 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/HEVCR720pAacShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class HEVCR720pAacShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/1280x720/mp4_libx265_libfaac/";
private final String[] mMedias = {
@@ -34,10 +30,6 @@
"bbb_short.fmpeg.1280x720.mp4.libx265_6500kbps_30fps.libfaac_stereo_128kbps_48000hz.mp4"
};
- public HEVCR720pAacShortPlayerTest() {
- super(CamcorderProfile.QUALITY_720P, VideoEncoder.H264, AudioEncoder.AAC);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
index 05bfb42..7c65824 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
@@ -20,6 +20,7 @@
import android.app.Instrumentation;
import android.content.Intent;
import android.media.CamcorderProfile;
+import android.cts.util.MediaUtils;
import android.media.MediaRecorder.AudioEncoder;
import android.media.MediaRecorder.VideoEncoder;
import android.os.Environment;
@@ -42,22 +43,6 @@
protected static final int REPEAT_NUMBER_FOR_LONG_CLIPS = 1;
protected static final int REPEAT_NUMBER_FOR_REPEATED_PLAYBACK = 20;
private static final String TAG = "MediaPlayerStressTest";
- // whether a video format is supported or not.
- private final boolean mSupported;
-
- /**
- * construct a test case with check of whether the format is supported or not.
- * @param quality
- * @param videoCodec
- * @param audioCodec
- */
- protected MediaPlayerStressTest(int quality, int videoCodec, int audioCodec) {
- mSupported = VideoPlayerCapability.formatSupported(quality, videoCodec, audioCodec);
- }
-
- protected MediaPlayerStressTest() {
- mSupported = true; // supported if nothing specified
- }
/**
* provides full path name of video clip for the given media number
@@ -120,11 +105,6 @@
* @throws Exception
*/
protected void doTestVideoPlayback(int mediaNumber, int repeatCounter) throws Exception {
- if (!mSupported) {
- Log.i(TAG, "Not supported!");
- return;
- }
-
File playbackOutput = new File(WorkDir.getTopDir(), "PlaybackTestResult.txt");
Writer output = new BufferedWriter(new FileWriter(playbackOutput, true));
@@ -140,6 +120,9 @@
Activity act = inst.startActivitySync(intent);
String mediaName = getFullVideoClipName(mediaNumber);
+ if (!MediaUtils.checkCodecsForPath(inst.getTargetContext(), mediaName)) {
+ return; // not supported, message is already logged
+ }
for (int i = 0; i < repeatCounter; i++) {
Log.v(TAG, "start playing " + mediaName);
onCompleteSuccess =
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/VideoPlayerCapability.java b/tests/tests/mediastress/src/android/mediastress/cts/VideoPlayerCapability.java
deleted file mode 100644
index f8dd2aa..0000000
--- a/tests/tests/mediastress/src/android/mediastress/cts/VideoPlayerCapability.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.mediastress.cts;
-
-import android.media.CamcorderProfile;
-import android.util.Log;
-
-import junit.framework.Assert;
-
-public class VideoPlayerCapability {
- private static final String TAG = "VideoPlayCapability";
-
- static boolean formatSupported(int quality, int videoCodec, int audioCodec) {
- if (!CamcorderProfile.hasProfile(quality)) {
- Log.i(TAG, "quality " + quality + " not supported");
- return false;
- }
- CamcorderProfile profile = CamcorderProfile.get(quality);
- Assert.assertNotNull(profile);
- if ((profile.videoCodec == videoCodec) && (profile.audioCodec == audioCodec)) {
- Log.i(TAG, "quality " + quality + " video codec " + videoCodec + " audio codec " +
- audioCodec + " supproted");
- return true;
- }
- return false;
- }
-
-}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360LongPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360LongPlayerTest.java
index 6b43558..372f034 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360LongPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360LongPlayerTest.java
@@ -16,20 +16,12 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class Vp8R480x360LongPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_full/480x360/webm_libvpx_libvorbis/";
private final String[] mMedias = {
"bbb_full.ffmpeg.480x360.webm.libvpx_500kbps_25fps.libvorbis_stereo_128kbps_44100Hz.webm"
};
- public Vp8R480x360LongPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.VP8, AudioEncoder.VORBIS);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackLong(0);
}
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360ShortPlayerTest.java b/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360ShortPlayerTest.java
index 737032b..30b4d2e 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360ShortPlayerTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/Vp8R480x360ShortPlayerTest.java
@@ -16,10 +16,6 @@
package android.mediastress.cts;
-import android.media.CamcorderProfile;
-import android.media.MediaRecorder.AudioEncoder;
-import android.media.MediaRecorder.VideoEncoder;
-
public class Vp8R480x360ShortPlayerTest extends MediaPlayerStressTest {
private static final String VIDEO_PATH_MIDDLE = "bbb_short/480x360/webm_libvpx_libvorbis/";
private final String[] mMedias = {
@@ -37,10 +33,6 @@
"bbb_short.ffmpeg.480x360.webm.libvpx_500kbps_30fps.libvorbis_stereo_192kbps_44100Hz.webm"
};
- public Vp8R480x360ShortPlayerTest() {
- super(CamcorderProfile.QUALITY_480P, VideoEncoder.VP8, AudioEncoder.VORBIS);
- }
-
public void testPlay00() throws Exception {
doTestVideoPlaybackShort(0);
}
