media: add mpeg4 qcif test to VideoDecoderPerfTest.
Bug: 23587558
Bug: 24259924
Change-Id: Ib837e0e52035fdf3e12988a94aaae72f87882c8e
diff --git a/tests/tests/media/res/raw/video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz.mp4
new file mode 100644
index 0000000..6b6040f
--- /dev/null
+++ b/tests/tests/media/res/raw/video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz.mp4
Binary files differ
diff --git a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
index f5680f6..8797b9b 100644
--- a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
@@ -61,6 +61,7 @@
private MediaFormat mDecOutputFormat;
private double[] mMeasuredFps;
private String[] mResultRawData;
+ private boolean mVerifyResults;
private Resources mResources;
private DeviceReportLog mReportLog;
@@ -68,6 +69,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
+ mVerifyResults = true;
mResources = mContext.getResources();
mReportLog = new DeviceReportLog();
}
@@ -298,6 +300,10 @@
mResultRawData[round] = result;
}
+ if (!mVerifyResults) {
+ return true;
+ }
+
return MediaUtils.verifyResults(name, mime, w, h, fps);
}
@@ -541,6 +547,20 @@
352, 288, true /* isGoog */);
}
+ public void testMPEG40176x0144Other() throws Exception {
+ mVerifyResults = false;
+ decode(VIDEO_MPEG4,
+ R.raw.video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz,
+ 176, 144, false /* isGoog */);
+ }
+
+ public void testMPEG40176x0144Goog() throws Exception {
+ mVerifyResults = false;
+ decode(VIDEO_MPEG4,
+ R.raw.video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz,
+ 176, 144, true /* isGoog */);
+ }
+
public void testMPEG40480x0360Other() throws Exception {
decode(VIDEO_MPEG4,
R.raw.video_480x360_mp4_mpeg4_860kbps_25fps_aac_stereo_128kbps_44100hz,
