| commit | 993e0e230f7d28a0889c83d17386ec21f9cf9c50 | [log] [tgz] |
|---|---|---|
| author | Ronghua Wu <ronghuawu@google.com> | Thu Dec 04 11:44:43 2014 -0800 |
| committer | Ronghua Wu <ronghuawu@google.com> | Fri Dec 05 11:32:45 2014 -0800 |
| tree | b6d187c43eff98aa001dedc160387fe040c0f3e6 | |
| parent | 2568025d95587addc694660352f3ac7701bd6d8c [diff] |
media: fix 4k hevc test stream Bug: 18355427 Change-Id: I5c5b38e6680bdd648273a3b4a2327f9c9a0a5b91
diff --git a/tests/tests/media/res/raw/video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4 deleted file mode 100644 index 7b663a4..0000000 --- a/tests/tests/media/res/raw/video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4 +++ /dev/null Binary files differ
diff --git a/tests/tests/media/res/raw/video_3840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4 b/tests/tests/media/res/raw/video_3840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4 new file mode 100644 index 0000000..9277fbd --- /dev/null +++ b/tests/tests/media/res/raw/video_3840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4 Binary files differ
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java index c8f2064..5371f67 100644 --- a/tests/tests/media/src/android/media/cts/DecoderTest.java +++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -1047,8 +1047,8 @@ testDecode(R.raw.video_1920x1080_mp4_hevc_10240kbps_30fps_aac_stereo_128kbps_44100hz, 299); } - public void testHEVCDecode30fps2840x2160() throws Exception { - testDecode(R.raw.video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz, 299); + public void testHEVCDecode30fps3840x2160() throws Exception { + testDecode(R.raw.video_3840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz, 299); } private void testCodecEarlyEOS(int resid, int eosFrame) throws Exception {