History log of /cts/tests/tests/media/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f6df82878052f4d722cf40f75166adc439788043 29-Jun-2016 Jia Zhao <jiaqzhao@google.com> Merge "Add test to detect some rendering inaccuracy." into nyc-dev
ea8bc7d425196d3305214ec9e41137e96fa57f9f 25-Jun-2016 Gaurav Mishra <mishragaurav@google.com> Merge "CTS: Migrate DecoderConformanceTest to new metric logging." into nyc-dev
6b17bbfc4ba94bd9c8e83912fa37dc73a490d615 24-Jun-2016 Phil Burk <philburk@google.com> CTS AudioTrackSurroundTest: allow pass if no PCM device available

Some changes in AudioFlinger should allow this to work.

Bug: 29611832
Change-Id: I8c293dccd28152865cba85d90083543734fbcd4d
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/AudioTrackSurroundTest.java
5a70084eab0c0a18fc6f5c7f3c7b3c6169e7da56 23-Jun-2016 Andy Hung <hunga@google.com> Merge "AudioTrackSurroundTest: Add delay when switching between compressed formats" into nyc-dev
d030230a35b54e0017cae83e5312212148b328e9 21-Jun-2016 Jia Zhao <jiaqzhao@google.com> Add test to detect some rendering inaccuracy.

When the decoded frame has a smaller size than the buffer, the decoder
will send cropping information to SurfaceTexture. In this case, the
output from getTransformMatrix will cause rendering to be inaccurate
(due
to the workaround to prevent texture bleeding). DecodeAccuracyTest was
not aware of this inaccuracy and would fail even when the decoder
produced the correct output buffer. This change makes DecodeAccuracyTest
more lenient by testing the rendered output against 6 cropped and scaled
versions of the "golden" image in addition to the original. The six ways
of cropping and scaling are based on GLConsumer.computeTransformMatrix.

Bug: 29218487

Change-Id: Iac42a0402c0086ee7a50649a7dbcb7ffd9de2ca2
ssets/520x360h264decodertest.mp4
es/raw/h264decodertest520x360golden.png
es/raw/h264decodertest520x360original.png
rc/android/media/cts/DecodeAccuracyTest.java
rc/android/media/cts/DecodeAccuracyTestBase.java
997a182cdcbb9a28c5027ae809de8c9c6cf77e5f 23-Jun-2016 Gaurav Mishra <mishragaurav@google.com> CTS: Migrate DecoderConformanceTest to new metric logging.

Bug:27950009
Bug:27925818
Change-Id: I058242b84322e91f7ae777ef9330f7f3e1f02dcc
rc/android/media/cts/DecoderConformanceTest.java
430fc38919ffe67bb51ff9333b290c31bc2a09ee 23-Jun-2016 Andy Hung <hunga@google.com> AudioTrackSurroundTest: Add delay when switching between compressed formats

Bug: 29422933
Change-Id: I9108bcd058d585db248f9cf475d5f087fcae7992
rc/android/media/cts/AudioTrackSurroundTest.java
3f30a5c2080eed98ed0919833dd6764f1d891411 23-Jun-2016 Phil Burk <philburk@google.com> Merge "CTS AudioTrackSurroundTest: add device info logging" into nyc-dev
5e942bfb4decd4b68962406c23763766aa618fec 22-Jun-2016 Andy Hung <hunga@google.com> Merge "Relax timestamp checks" into nyc-dev
a346a4e26b6e44ff9c952550cb69215939f7f8c7 21-Jun-2016 Andy Hung <hunga@google.com> Relax timestamp checks

Do not test for drain in case timestamps are emulated by AudioFlinger when
HW does not provide them.

Compute buffer size to allow timestamp tests with deep buffer devices
such as Bluetooth.

Bug: 29423451
Change-Id: I5c97bc9059efac4f667f35c13082831025a8ba91
rc/android/media/cts/AudioTrackTest.java
fc520dadcc48565d4e19f7edfc7ad2d84481b9d8 22-Jun-2016 Eric Laurent <elaurent@google.com> Merge "Remove check on default sampling rate for AudioRecord and AudioTrack Builder" into nyc-dev
ec787073c751a6c561e3138c97f1e8a7927f456c 21-Jun-2016 Jean-Michel Trivi <jmtrivi@google.com> Notification policy access: fix adding / removing package name

When adding a package to ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
verify it's not already in the list.
When ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES contains only the
package to remove, set the setting to "null" string.

Bug 29512300

Change-Id: Ie64c10ff293d8a70f7f601396a988e96361bcd19
rc/android/media/cts/Utils.java
9b941abe1a157cc4ce38f05864e5dae80120c5d2 21-Jun-2016 Eric Laurent <elaurent@google.com> Remove check on default sampling rate for AudioRecord and AudioTrack Builder

The default sampling rate chosen for an AudioTrack or AudioRecord
constructed with a Builder not specifying a sampling rate is not
the primary output sampling rate but depends on the device actually
selected.

Bug: 29541155
Change-Id: I2f2f6a38da55f754365f062c2d83845faa670a85
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
4e3628dc2517a0b866455ef2d6aadd478cc72c68 21-Jun-2016 Phil Burk <philburk@google.com> CTS AudioTrackSurroundTest: add device info logging

To help debug an intermittent failure.

Bug: 29422933
Change-Id: Ie275f2025cc462a74e9b011624b145f0ece1c554
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/AudioTrackSurroundTest.java
4144b091802882c81a0400d3c5f5cc7408626135 21-Jun-2016 Phil Burk <philburk@google.com> Merge "AudioTrackSurroundTest: check for PCM support before running PCM tests" into nyc-dev
c6dd674362e1efa306bad6ea7be623c61230479d 21-Jun-2016 Lajos Molnar <lajos@google.com> media: performance test tweaks

- fix mpeg4 test file to fit into Level 3 limits
- relax performance tolerance

Bug: 28752802
Change-Id: I2730d7662167c212bf1a93540d1120d13b80d9f2
es/raw/video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz.mp4
b9265d913f36643e29459eda553745b352932e53 16-Jun-2016 Jia Zhao <jiaqzhao@google.com> Test decoder render into SurfaceView.

b/28964957

Change-Id: Iaeeef511fab39af5e6078236a47532e7da9ce6c8
rc/android/media/cts/DecodeAccuracyTest.java
rc/android/media/cts/DecodeAccuracyTestBase.java
577bcaa9355ef988b259967542f2bd635b64c700 18-Jun-2016 Lajos Molnar <lajos@google.com> media: reduce performance and quality test timeout to 5min

This speeds up the test suite execution time without sacrificing
the quality of the tests (quality is tested max 12 seconds per
run, performance for max 2 minutes).

Bug: 28752802
Change-Id: I020bfa35ef74c51c340ebe51c3d7744ea9717d18
rc/android/media/cts/VideoDecoderPerfTest.java
63833a6dd82615cffd591265a62e9cbf57c43d78 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 3840x2160 vp9 test files

replace file with 30fps and 60fps files of proper bitrate

Bug: 28752802
Change-Id: Id3fb5abae89ff50f67e397009b93adb3546ba0c8
es/raw/bbb_s2_3840x2160_webm_vp9_0p51_20mbps_60fps_vorbis_6ch_384kbps_32000hz.webm
es/raw/bbb_s4_3840x2160_webm_vp9_0p5_20mbps_30fps_vorbis_6ch_384kbps_24000hz.webm
es/raw/video_3840x2160_webm_vp9_20480kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
341ef0ed1753b304dcea0050a3a0ebda93f5df1f 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1920x1080 vp9 test file

replace 30fps file with 60fps one of proper bitrate

Bug: 28752802
Change-Id: Id99bc58fa01d8f3d5a75bb221bdec9dbdd732ba0
es/raw/bbb_s2_1920x1080_webm_vp9_0p41_10mbps_60fps_vorbis_6ch_384kbps_22050hz.webm
es/raw/video_1920x1080_webm_vp9_10240kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
ef06d8de0e087c60de60ee53b756cf5078fb4a5c 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1280x720 vp9 test files

replace files with single file of proper bitrate.
replace 720p files with 360p files for basic testing.

Bug: 28752802
Change-Id: I426c226c2f4f71f2f3fe552c2ba097500506d736
es/raw/bbb_s4_1280x720_webm_vp9_0p31_4mbps_30fps_opus_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp9_309kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp9_4096kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaMetadataRetrieverTest.java
rc/android/media/cts/NativeDecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
f60cca80cf3c4cbee9030b9fcf212f3e0f7afc36 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 640x360 vp9 test file

replace file with one of proper bitrate.

Bug: 28752802
Change-Id: I93dd3f2d090b82072428fddf60a51f42986c87e3
es/raw/bbb_s1_640x360_webm_vp9_0p21_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_640x360_webm_vp9_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/NativeDecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
99bd2de15b70c988973157fdbbeb8bdf58fe36fd 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 320x240 vp9 test file with 320x180 file

replace file with one of proper size an bitrate.

Bug: 28752802
Change-Id: Ib167cccbdd14947514ac42209b5100cd26ede5f8
es/raw/bbb_s1_320x180_webm_vp9_0p11_600kbps_30fps_vorbis_mono_64kbps_48000hz.webm
es/raw/video_320x240_webm_vp9_600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
6d97e3759cd1e5dc8759cbfd0c44d2382bcb88b4 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1920x1080 vp8 test files

replace files with ones of proper bitrate

Bug: 28752802
Change-Id: I903650ba37943fbcf01a1302f85623366b524444
es/raw/bbb_s2_1920x1080_webm_vp8_20mbps_60fps_vorbis_6ch_384kbps_48000hz.webm
es/raw/bbb_s4_1920x1080_wide_webm_vp8_20mbps_30fps_vorbis_6ch_384kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
99148fa7bada7e4612395193939b72135d181499 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1280x720 vp8 test files

replace files with ones of proper bitrate.
remove unrealistically low bitrate file.

Bug: 28752802
Change-Id: I4e6e0fd5c986eec245af3db07a2988ce58374535
es/raw/bbb_s3_1280x720_webm_vp8_8mbps_60fps_opus_6ch_384kbps_48000hz.webm
es/raw/bbb_s4_1280x720_webm_vp8_8mbps_30fps_opus_mono_64kbps_48000hz.webm
es/raw/video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_60fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/NativeDecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
b8d5bcfb6a22434d71918dd53f9f8210722ba902 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 640x360 vp8 test file

replace file with one of proper bitrate.

Bug: 28752802
Change-Id: Id13399bdfd372111c54e6943084cf5056863a061
es/raw/bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz.webm
es/raw/video_640x360_webm_vp8_2048kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaMetadataRetrieverTest.java
rc/android/media/cts/NativeDecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
0dc0e1cdaa4aa164214a1be8a86107e7311bd597 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 320x240 vp8 test file with 320x180 file

replace file with one of correct size and bitrate.

Bug: 28752802
Change-Id: I377aca62f7e0d5976bcbec44aa0d66a60f4fb7ad
es/raw/bbb_s1_320x180_webm_vp8_800kbps_30fps_opus_5ch_320kbps_48000hz.webm
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
178278260ae4a970e5694a9863d169b4dfc37345 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 3840x2160 hevc test files

rename 30fps file (it was 60fps) and add 30fps file.

Bug: 28752802
Change-Id: I3c10c8d9d3096fe602a2388482037605c7284197
es/raw/bbb_s2_3840x2160_mp4_hevc_mp51_20mbps_60fps_aac_lc_6ch_384kbps_32000hz.mp4
es/raw/bbb_s4_3840x2160_mp4_hevc_mp5_20mbps_30fps_aac_lc_6ch_384kbps_24000hz.mp4
es/raw/video_3840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
aff93003f17a39087f011615d5ac2828a78716e7 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1920x1080 hevc test file

replace 30fps file with 60fps file.

Bug: 28752802
Change-Id: I8eb5e45c63f0c98acd7c81909d7da6dd996c5ea2
es/raw/bbb_s2_1920x1080_mp4_hevc_mp41_10mbps_60fps_aac_lc_6ch_384kbps_22050hz.mp4
es/raw/video_1920x1080_mp4_hevc_10240kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
06190f46835af928293eff2ed529c5490fee45cb 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1280x720 hevc test file

replace file with proper bitrate
don't use level 31 files for basic testing as those are not required to be supported

Bug: 28752802
Change-Id: I5b29dd5bbf318659384c4df34fbabeda4f82842d
es/raw/bbb_s4_1280x720_mp4_hevc_mp31_4mbps_30fps_aac_he_stereo_80kbps_32000hz.mp4
es/raw/video_1280x720_mp4_hevc_1150kbps_30fps_aac_stereo_128kbps_48000hz.mp4
es/raw/video_1280x720_mp4_hevc_4096kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaMetadataRetrieverTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
163676a464f8e1063b3729db7442be05e6474370 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 640x360 hevc test files to 720x480 file

replace 360 files with one of proper bitrate.
remove unused files
use 480p file for basic testing as CDD requires level 3
support

Bug: 28752802
Change-Id: Id6a4014fe7823a24bcf62cb2c003591c35fefa5e
es/raw/bbb_s1_640x360_mp4_hevc_mp21_1600kbps_30fps_aac_he_6ch_288kbps_44100hz.mp4
es/raw/bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz.mp4
es/raw/video_480x360_mp4_hevc_325kbps_30fps_aac_stereo_128kbps_48000hz.mp4
es/raw/video_640x360_mp4_hevc_1638kbps_30fps_aac_stereo_128kbps_44100hz
es/raw/video_640x360_mp4_hevc_450kbps_30fps_aac_stereo_128kbps_48000hz.mp4
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
fe47a6a1de0fbc1a7826ea575507d5d182d735bd 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 352x288 hevc test file

replace file with proper bitrate file.

Bug: 28752802
Change-Id: I43902c7cf03647a3b571bf0b2eb0fd0a19b914ca
es/raw/bbb_s1_352x288_mp4_hevc_mp2_600kbps_30fps_aac_he_stereo_96kbps_48000hz.mp4
es/raw/video_352x288_mp4_hevc_600kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
730c96f887bfff1bd292319dfe35b958ab48e9ef 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1920x1080 h264 test files

rename main profile level 4 file to new naming convention
test on high profile test files for TV
replaced high profile 60fps clip with main profile

Bug: 28752802
Change-Id: I7b8370d6249fdf83ca7fb32c4e77b456e1f02a16
es/raw/bbb_s2_1920x1080_mp4_h264_hp42_20mbps_60fps_aac_lc_6ch_384kbps_48000hz.mp4
es/raw/bbb_s2_1920x1080_mp4_h264_mp42_20mbps_60fps_aac_he_v2_5ch_160kbps_48000hz.mp4
es/raw/bbb_s4_1920x1080_wide_mp4_h264_hp4_20mbps_30fps_aac_lc_6ch_384kbps_44100hz.mp4
es/raw/bbb_s4_1920x1080_wide_mp4_h264_mp4_20mbps_30fps_aac_he_5ch_200kbps_44100hz.mp4
es/raw/video_1920x1080_mp4_h264_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1920x1080_mp4_h264_20480kbps_60fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
436bb558e4415098d4c2627b8fdb2df745f4c07e 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 1280x720 h264 test files

- replace high profile 30fps file with main profile.
- test main profile 60fps using a file for TV.

Bug: 28752802
Change-Id: Ica053fcb0ed225095df74eb0dea3da92d4385a6d
es/raw/bbb_s3_1280x720_mp4_h264_hp32_8mbps_60fps_aac_he_v2_stereo_48kbps_48000hz.mp4
es/raw/bbb_s3_1280x720_mp4_h264_mp32_8mbps_60fps_aac_he_v2_6ch_144kbps_44100hz.mp4
es/raw/bbb_s4_1280x720_mp4_h264_mp31_8mbps_30fps_aac_he_mono_40kbps_44100hz.mp4
es/raw/video_1280x720_mp4_h264_8192kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_mp4_h264_8192kbps_60fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaMetadataRetrieverTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
cd19f1d15ab82babc8b9fe2e7b593b5f37f5730b 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 720x480 h264 test file

replace high-profile file with main-profile one.

Bug: 28752802
Change-Id: Ib19e169760cfc6d21e266ef7d7499ca31f808e60
es/raw/bbb_s1_720x480_mp4_h264_mp3_2mbps_30fps_aac_lc_5ch_320kbps_48000hz.mp4
es/raw/video_720x480_mp4_h264_2048kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
30deec02576afeeea87bfc1f5ff39c5468dea516 17-Jun-2016 Lajos Molnar <lajos@google.com> media: update 320x240 h264 test file

replace high-profile file with main-profile level 2.

Bug: 28752802
Change-Id: I12bb7a09d080a3fac24fdaf5b525687d8af5b692
es/raw/bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz.mp4
es/raw/video_320x240_mp4_h264_800kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
4d48fa2917d59a56c65d54e1931e6b90545dd4a1 16-Jun-2016 Lajos Molnar <lajos@google.com> media: update performance tests to be quasi-parameterized

Bug: 28752802
Change-Id: I4ad8ca460154682ad24559cc3d9210a67c676677
rc/android/media/cts/VideoDecoderPerfTest.java
331e3635b1f772d61db0e043906e233d503fb44a 16-Jun-2016 Lajos Molnar <lajos@google.com> media: improve performance tests

- set bitrate properly using codec caps for encoders
- use max 30fps for encoders
- use 1ms dequeue timeout
- return run results in structs
- report bitrate in results
- report achieved bitrate in encoder results
- run performance tests for a minimum of 10 seconds and 3000 frames

Bug: 28752802
Change-Id: Idf774055a97fe882574b756c8ce7a2a1423f2df7
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
rc/android/media/cts/VideoEncoderTest.java
20a3f76602ac9bb697a17ab58e90e0fd394f6a8f 16-Jun-2016 Lajos Molnar <lajos@google.com> media: separate quality and performance tests for encoders and decoders

remove unused tests to speed up test runs
- don't decode during encoder performance tests
- encode only once when using all decoders during encoder quality tests
- don't decode to bytebuffers during decoder performance tests

- get codecs by fuller format
- move performance related code into deviceutil.MediaPerfUtils
- report encoder and decoder performance in a uniform fashion
- keep frame-time statistics in micro-seconds (as we report in them)

Bug: 28752802
Change-Id: I74a2beebc590230b99ad0e039bcc41b929fb106b
rc/android/media/cts/VideoDecoderPerfTest.java
9f67f0f2c239330040323010aece57fa9e1263ee 16-Jun-2016 Lajos Molnar <lajos@google.com> media: move getDecoderNames and getEncoderNames to MediaUtils

- use format instead of just mime to get codecs
- also fix color-aspects to use proper device log
- mark skipped encoder- and color-aspects tests

Bug: 28752802
Change-Id: I3f2b272447ffcd5677e317ef1aa98390915e44b1
rc/android/media/cts/CodecUtils.java
rc/android/media/cts/DecoderConformanceTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
d1c476b38fd560e462d5c7b0e898670b26ffbe46 23-May-2016 Lajos Molnar <lajos@google.com> media: update video codec performance metric calculation

- use 1 second sliding window to determine frame rate statistics
- use 95th percentile vs. 0th to get a more useful metric
(that is video codec rate is that or higher 95% of the time.)
- don't log decoder metrics for encoder tests as generated bitstream
is not representative.

Bug: 28752802
Change-Id: If82f0201495b685e39c4e756b55f58e646199d42
rc/android/media/cts/VideoDecoderPerfTest.java
18c3043a8fc95a82993e71c9cc72719d4eac84b4 18-Jun-2016 Phil Burk <philburk@google.com> AudioTrackSurroundTest: check for PCM support before running PCM tests

Bug: 29422933
Change-Id: Idbbdebb976b7bb91b6968e752c466032c845cc9a
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/AudioTrackSurroundTest.java
661a753d03dc2edd14e673077833484f92147e48 17-Jun-2016 Nicholas Sauer <nicksauer@google.com> Merge "Remove TimeoutReq." into nyc-dev
a7b6b7d197a1ebbe46cffa8f0ff488166d83eefc 17-Jun-2016 Nicholas Sauer <nicksauer@google.com> Remove TimeoutReq.

bug: 28275374
Change-Id: Ia3e151f3013ed3f628499caa575c05fe91e1bbed
rc/android/media/cts/DecodeAccuracyTest.java
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
847539efa658d3f351c9b30410b96c0ce9259a71 15-Jun-2016 Jean-Michel Trivi <jmtrivi@google.com> Media tests: fix toggling of notification access setting

Fix adding a package to ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES
when there are none.
Fix removing a package from ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES
when it's the only one that had been previously added.

Bug 29381555

Change-Id: I3759c1175ee656d7a9f87f8bf507fcaf76d42ddf
rc/android/media/cts/Utils.java
4c701f2f9b16bea844c64a3b1f1a664c99bf00f3 15-Jun-2016 Gaurav Mishra <mishragaurav@google.com> Merge "CTS: Migrate media perf tests to new metric logger." into nyc-dev
de23a540ff7de059c86586e2c23c45334d95de71 13-Jun-2016 Gaurav Mishra <mishragaurav@google.com> CTS: Migrate media perf tests to new metric logger.

Bug:29115584
Bug:27950009
Bug:27925818
Change-Id: I0b341e76e8bbd3f32f31cc054859b4c5860f2704
rc/android/media/cts/VideoDecoderPerfTest.java
6cc8a061bead2b05794a01a5d42ae4d5db62f25c 14-Jun-2016 js_ou <js_ou@htc.com> Merge \\\\\"EncodeVirtualDisplayWithCompositionTest: Add codec name API.\\\\\" into marshmallow-cts-dev am: 1d35766a53 am: 545f829676 am: f6db4eb3c8 am: ce0e5da7fe
am: 3693627c6d

Change-Id: Iaba75f934870d1de2f86cf29cd7f5c41cb410ba6
1d35766a53dd25516c72ae4e8f488302b1436ad6 14-Jun-2016 Daniel Xie <dxie@google.com> Merge "EncodeVirtualDisplayWithCompositionTest: Add codec name API." into marshmallow-cts-dev
6723f1592118a9db923b4e3c908a74e53d90ece2 13-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: A add one more AVC test stream to test the color aspects." into nyc-dev
250b34da39ae8d40cb22caf54caef3b38b1fef52 11-Jun-2016 Lajos Molnar <lajos@google.com> Merge "MediaPlayerTest: add tests for setPlaybackParams." into nyc-dev
214b9c94eb1722fda669b54fc74eadb76a4ccef0 09-Jun-2016 Wei Jia <wjia@google.com> MediaPlayerTest: add tests for setPlaybackParams.

Bug: 29032949
Bug: 29209515
Change-Id: Ieea685c916c090f2a2dcbf3d054646524d2399d7
rc/android/media/cts/MediaPlayerTest.java
56823a3629575d8b12cda6f4e60ab9d80c735ae0 09-Jun-2016 Lajos Molnar <lajos@google.com> media: fix NativeDecoderTest.testMuxer issues

- disable MPEG2 mux test as MediaMuxer does not support MPEG2
- fix HEVC test stream as MediaMuxer does not support streams with
B-frames
- add comments to warn about lack of B-frame support

Bug: 29208170
Change-Id: I61c2a1171e35991310c3fafe7be60c34ac72ce56
es/raw/video_640x360_mp4_hevc_450kbps_no_b.mp4
rc/android/media/cts/NativeDecoderTest.java
7258e74914e1b891f33afbe8f39d30805c8f7166 08-Jun-2016 Pawin Vongmasa <pawin@google.com> Merge "MediaPlayerTest: Ignore and log unsupported files in testResumeAtEnd and testPositionAtEnd." into nyc-dev
0a78c8d9d063b2220a4fa153ce54a7c1351d5dfc 08-Jun-2016 Pawin Vongmasa <pawin@google.com> Merge "Increase timeout for testDeselectTrackForSubtitleTracks." into nyc-dev
d105427337086371c08b7f89f3e88c7a8f425dd5 04-Jun-2016 Hangyu Kuang <hkuang@google.com> media: A add one more AVC test stream to test the color aspects.

Also refactor the code to combine both the tests of vendor and Google.

Bug:28961357
Change-Id: I32ccd391f74dbea9f7b152e0b6c22e2f4b883b8b
es/raw/color_176x144_bt601_fr_sdr_h264.mp4
rc/android/media/cts/DecoderTest.java
9ea17ba8bedda33bc649812d812eb7f698bb306a 07-Jun-2016 Pawin Vongmasa <pawin@google.com> Increase timeout for testDeselectTrackForSubtitleTracks.

Fugu parses subtitle data up to approximately 1.9 seconds in advance.
When a subtitle track is selected, the earliest available data for the
selected track could be up to 1.9 seconds ahead of the current media
time.

Bug: 29124180
Change-Id: I026b3cd4f91e785215a8dddb71b69dcd639db36e
rc/android/media/cts/MediaPlayerTest.java
69aa29c0fd358b180740a218ae730440b08b300c 03-Jun-2016 Pawin Vongmasa <pawin@google.com> MediaPlayerTest: Ignore and log unsupported files in
testResumeAtEnd and testPositionAtEnd.

Skip and log test files whose formats are not supported.

Bug: 29103883
Change-Id: I03cd07f46ad67e5f73d957b2f606b8c23e9124d1
rc/android/media/cts/MediaPlayerTest.java
5a4b1095b153672be7e692dae889af6076fd5bcc 29-Apr-2016 Gaurav Mishra <mishragaurav@google.com> Migrate cts tests to new metric logging system.

Bug: 27950009
Bug: 27925818
Change-Id: Ifcb3141198fe0812afeb40b87ea3ec7bcb342458
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackLatencyTest.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
111c33fa3e0ad50df75e983a91771d7d431360a1 02-Jun-2016 Marco Nelissen <marcone@google.com> Merge "Fix concurrent use of Random instance" into nyc-dev
e2717012d7eeb7d895317501527e9e74fe59b194 02-Jun-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Extend CTS EOS test to also test Software codecs. Also extend the test to test single frame with EOS flag." into nyc-dev
b340e00335e17c9da6b44a63031876853faa67cd 02-Jun-2016 Marco Nelissen <marcone@google.com> Fix concurrent use of Random instance

and make sure filenames are unique.

Bug: 28861788
Change-Id: I6a9397cebf48aa00da44255dd509872447676229
rc/android/media/cts/EncoderTest.java
890e3e23c801bdca308698f83b6cf6d50d0b3088 02-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "media: fix HEVC stream levels" into nyc-dev
6c9510a74372572e2e86c3b81a524f67de82b63b 01-Jun-2016 Hangyu Kuang <hkuang@google.com> media: Extend CTS EOS test to also test Software codecs.
Also extend the test to test single frame with EOS flag.

Bug: 28966925
Change-Id: I3d2d4800d6b7becb77a068aa3b0db6433095945a
rc/android/media/cts/DecoderTest.java
78d3bb715967ed97f01c83a102707ef4efac3381 02-Jun-2016 Lajos Molnar <lajos@google.com> media: fix HEVC stream levels

These were marked at level 6.2 but they are 3.1 and 2.1

Bug: 28671284
Change-Id: Ie48ef539d8337570b845c6bda5af1b34bb98437a
es/raw/video_1280x720_mp4_hevc_1150kbps_30fps_aac_stereo_128kbps_48000hz.mp4
es/raw/video_480x360_mp4_hevc_325kbps_30fps_aac_stereo_128kbps_48000hz.mp4
es/raw/video_480x360_mp4_hevc_650kbps_30fps_aac_stereo_128kbps_48000hz.mp4
c0ee797506867a85c1158535bc35220f6f030422 01-Jun-2016 Lajos Molnar <lajos@google.com> media: update and fix NativeDecoderTest.testMuxer

- test all supported video formats and muxers
- lax duration requirement for webm
- also verify CSD and HDR bytebuffer contents

Bug: 28931391
Change-Id: If177df886542ae4f3b64c036c142e55141a33b75
es/raw/video_1280x720_webm_vp9_csd_309kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_176x144_mp4_mpeg2_105kbps_25fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_256x144_webm_vp9_hdr_83kbps_24fps.webm
rc/android/media/cts/NativeDecoderTest.java
50a0214fbe219f12405c01fcf8bf7f213996d39e 28-May-2016 Andy Hung <hunga@google.com> Merge "Do not run AudioRecordRoutingNative without microphone" into nyc-dev
4924fd6f80ea8eba548bbad37c74f452ce70a4e9 28-May-2016 Pawin Vongmasa <pawin@google.com> Merge "Add texture coordinate transformation before rendering." into nyc-dev
00ec549cd999dc63792a8d8a53268773e3e6c1c1 27-May-2016 Andy Hung <hunga@google.com> Do not run AudioRecordRoutingNative without microphone

Bug: 27589011
Change-Id: I569901a4b1f24b5095572c0e4eb6c3e197dca717
rc/android/media/cts/AudioRecordRoutingNative.java
5b43cf9e2d09be9e22854dbf12f8978a6c86f378 22-Dec-2015 Hangyu Kuang <hkuang@google.com> Prepare for VP9 decode CTS test, add vp9 test vectors from libvpx.

Bug: 27484784
Change-Id: Id7afd2914ee04a2a4acf71e9e0cf71c19ba0e133
ndroid.mk
es/raw/vp90_2_00_quantizer_00.vp9
es/raw/vp90_2_00_quantizer_00_vp9_md5
es/raw/vp90_2_00_quantizer_01.vp9
es/raw/vp90_2_00_quantizer_01_vp9_md5
es/raw/vp90_2_00_quantizer_02.vp9
es/raw/vp90_2_00_quantizer_02_vp9_md5
es/raw/vp90_2_00_quantizer_03.vp9
es/raw/vp90_2_00_quantizer_03_vp9_md5
es/raw/vp90_2_00_quantizer_04.vp9
es/raw/vp90_2_00_quantizer_04_vp9_md5
es/raw/vp90_2_00_quantizer_05.vp9
es/raw/vp90_2_00_quantizer_05_vp9_md5
es/raw/vp90_2_00_quantizer_06.vp9
es/raw/vp90_2_00_quantizer_06_vp9_md5
es/raw/vp90_2_00_quantizer_07.vp9
es/raw/vp90_2_00_quantizer_07_vp9_md5
es/raw/vp90_2_00_quantizer_08.vp9
es/raw/vp90_2_00_quantizer_08_vp9_md5
es/raw/vp90_2_00_quantizer_09.vp9
es/raw/vp90_2_00_quantizer_09_vp9_md5
es/raw/vp90_2_00_quantizer_10.vp9
es/raw/vp90_2_00_quantizer_10_vp9_md5
es/raw/vp90_2_00_quantizer_11.vp9
es/raw/vp90_2_00_quantizer_11_vp9_md5
es/raw/vp90_2_00_quantizer_12.vp9
es/raw/vp90_2_00_quantizer_12_vp9_md5
es/raw/vp90_2_00_quantizer_13.vp9
es/raw/vp90_2_00_quantizer_13_vp9_md5
es/raw/vp90_2_00_quantizer_14.vp9
es/raw/vp90_2_00_quantizer_14_vp9_md5
es/raw/vp90_2_00_quantizer_15.vp9
es/raw/vp90_2_00_quantizer_15_vp9_md5
es/raw/vp90_2_00_quantizer_16.vp9
es/raw/vp90_2_00_quantizer_16_vp9_md5
es/raw/vp90_2_00_quantizer_17.vp9
es/raw/vp90_2_00_quantizer_17_vp9_md5
es/raw/vp90_2_00_quantizer_18.vp9
es/raw/vp90_2_00_quantizer_18_vp9_md5
es/raw/vp90_2_00_quantizer_19.vp9
es/raw/vp90_2_00_quantizer_19_vp9_md5
es/raw/vp90_2_00_quantizer_20.vp9
es/raw/vp90_2_00_quantizer_20_vp9_md5
es/raw/vp90_2_00_quantizer_21.vp9
es/raw/vp90_2_00_quantizer_21_vp9_md5
es/raw/vp90_2_00_quantizer_22.vp9
es/raw/vp90_2_00_quantizer_22_vp9_md5
es/raw/vp90_2_00_quantizer_23.vp9
es/raw/vp90_2_00_quantizer_23_vp9_md5
es/raw/vp90_2_00_quantizer_24.vp9
es/raw/vp90_2_00_quantizer_24_vp9_md5
es/raw/vp90_2_00_quantizer_25.vp9
es/raw/vp90_2_00_quantizer_25_vp9_md5
es/raw/vp90_2_00_quantizer_26.vp9
es/raw/vp90_2_00_quantizer_26_vp9_md5
es/raw/vp90_2_00_quantizer_27.vp9
es/raw/vp90_2_00_quantizer_27_vp9_md5
es/raw/vp90_2_00_quantizer_28.vp9
es/raw/vp90_2_00_quantizer_28_vp9_md5
es/raw/vp90_2_00_quantizer_29.vp9
es/raw/vp90_2_00_quantizer_29_vp9_md5
es/raw/vp90_2_00_quantizer_30.vp9
es/raw/vp90_2_00_quantizer_30_vp9_md5
es/raw/vp90_2_00_quantizer_31.vp9
es/raw/vp90_2_00_quantizer_31_vp9_md5
es/raw/vp90_2_00_quantizer_32.vp9
es/raw/vp90_2_00_quantizer_32_vp9_md5
es/raw/vp90_2_00_quantizer_33.vp9
es/raw/vp90_2_00_quantizer_33_vp9_md5
es/raw/vp90_2_00_quantizer_34.vp9
es/raw/vp90_2_00_quantizer_34_vp9_md5
es/raw/vp90_2_00_quantizer_35.vp9
es/raw/vp90_2_00_quantizer_35_vp9_md5
es/raw/vp90_2_00_quantizer_36.vp9
es/raw/vp90_2_00_quantizer_36_vp9_md5
es/raw/vp90_2_00_quantizer_37.vp9
es/raw/vp90_2_00_quantizer_37_vp9_md5
es/raw/vp90_2_00_quantizer_38.vp9
es/raw/vp90_2_00_quantizer_38_vp9_md5
es/raw/vp90_2_00_quantizer_39.vp9
es/raw/vp90_2_00_quantizer_39_vp9_md5
es/raw/vp90_2_00_quantizer_40.vp9
es/raw/vp90_2_00_quantizer_40_vp9_md5
es/raw/vp90_2_00_quantizer_41.vp9
es/raw/vp90_2_00_quantizer_41_vp9_md5
es/raw/vp90_2_00_quantizer_42.vp9
es/raw/vp90_2_00_quantizer_42_vp9_md5
es/raw/vp90_2_00_quantizer_43.vp9
es/raw/vp90_2_00_quantizer_43_vp9_md5
es/raw/vp90_2_00_quantizer_44.vp9
es/raw/vp90_2_00_quantizer_44_vp9_md5
es/raw/vp90_2_00_quantizer_45.vp9
es/raw/vp90_2_00_quantizer_45_vp9_md5
es/raw/vp90_2_00_quantizer_46.vp9
es/raw/vp90_2_00_quantizer_46_vp9_md5
es/raw/vp90_2_00_quantizer_47.vp9
es/raw/vp90_2_00_quantizer_47_vp9_md5
es/raw/vp90_2_00_quantizer_48.vp9
es/raw/vp90_2_00_quantizer_48_vp9_md5
es/raw/vp90_2_00_quantizer_49.vp9
es/raw/vp90_2_00_quantizer_49_vp9_md5
es/raw/vp90_2_00_quantizer_50.vp9
es/raw/vp90_2_00_quantizer_50_vp9_md5
es/raw/vp90_2_00_quantizer_51.vp9
es/raw/vp90_2_00_quantizer_51_vp9_md5
es/raw/vp90_2_00_quantizer_52.vp9
es/raw/vp90_2_00_quantizer_52_vp9_md5
es/raw/vp90_2_00_quantizer_53.vp9
es/raw/vp90_2_00_quantizer_53_vp9_md5
es/raw/vp90_2_00_quantizer_54.vp9
es/raw/vp90_2_00_quantizer_54_vp9_md5
es/raw/vp90_2_00_quantizer_55.vp9
es/raw/vp90_2_00_quantizer_55_vp9_md5
es/raw/vp90_2_00_quantizer_56.vp9
es/raw/vp90_2_00_quantizer_56_vp9_md5
es/raw/vp90_2_00_quantizer_57.vp9
es/raw/vp90_2_00_quantizer_57_vp9_md5
es/raw/vp90_2_00_quantizer_58.vp9
es/raw/vp90_2_00_quantizer_58_vp9_md5
es/raw/vp90_2_00_quantizer_59.vp9
es/raw/vp90_2_00_quantizer_59_vp9_md5
es/raw/vp90_2_00_quantizer_60.vp9
es/raw/vp90_2_00_quantizer_60_vp9_md5
es/raw/vp90_2_00_quantizer_61.vp9
es/raw/vp90_2_00_quantizer_61_vp9_md5
es/raw/vp90_2_00_quantizer_62.vp9
es/raw/vp90_2_00_quantizer_62_vp9_md5
es/raw/vp90_2_00_quantizer_63.vp9
es/raw/vp90_2_00_quantizer_63_vp9_md5
es/raw/vp90_2_01_sharpness_1.vp9
es/raw/vp90_2_01_sharpness_1_vp9_md5
es/raw/vp90_2_01_sharpness_2.vp9
es/raw/vp90_2_01_sharpness_2_vp9_md5
es/raw/vp90_2_01_sharpness_3.vp9
es/raw/vp90_2_01_sharpness_3_vp9_md5
es/raw/vp90_2_01_sharpness_4.vp9
es/raw/vp90_2_01_sharpness_4_vp9_md5
es/raw/vp90_2_01_sharpness_5.vp9
es/raw/vp90_2_01_sharpness_5_vp9_md5
es/raw/vp90_2_01_sharpness_6.vp9
es/raw/vp90_2_01_sharpness_6_vp9_md5
es/raw/vp90_2_01_sharpness_7.vp9
es/raw/vp90_2_01_sharpness_7_vp9_md5
es/raw/vp90_2_02_size_08x08.vp9
es/raw/vp90_2_02_size_08x08_vp9_md5
es/raw/vp90_2_02_size_08x10.vp9
es/raw/vp90_2_02_size_08x10_vp9_md5
es/raw/vp90_2_02_size_08x16.vp9
es/raw/vp90_2_02_size_08x16_vp9_md5
es/raw/vp90_2_02_size_08x18.vp9
es/raw/vp90_2_02_size_08x18_vp9_md5
es/raw/vp90_2_02_size_08x32.vp9
es/raw/vp90_2_02_size_08x32_vp9_md5
es/raw/vp90_2_02_size_08x34.vp9
es/raw/vp90_2_02_size_08x34_vp9_md5
es/raw/vp90_2_02_size_08x64.vp9
es/raw/vp90_2_02_size_08x64_vp9_md5
es/raw/vp90_2_02_size_08x66.vp9
es/raw/vp90_2_02_size_08x66_vp9_md5
es/raw/vp90_2_02_size_10x08.vp9
es/raw/vp90_2_02_size_10x08_vp9_md5
es/raw/vp90_2_02_size_10x10.vp9
es/raw/vp90_2_02_size_10x10_vp9_md5
es/raw/vp90_2_02_size_10x16.vp9
es/raw/vp90_2_02_size_10x16_vp9_md5
es/raw/vp90_2_02_size_10x18.vp9
es/raw/vp90_2_02_size_10x18_vp9_md5
es/raw/vp90_2_02_size_10x32.vp9
es/raw/vp90_2_02_size_10x32_vp9_md5
es/raw/vp90_2_02_size_10x34.vp9
es/raw/vp90_2_02_size_10x34_vp9_md5
es/raw/vp90_2_02_size_10x64.vp9
es/raw/vp90_2_02_size_10x64_vp9_md5
es/raw/vp90_2_02_size_10x66.vp9
es/raw/vp90_2_02_size_10x66_vp9_md5
es/raw/vp90_2_02_size_130x132.vp9
es/raw/vp90_2_02_size_130x132_vp9_md5
es/raw/vp90_2_02_size_132x130.vp9
es/raw/vp90_2_02_size_132x130_vp9_md5
es/raw/vp90_2_02_size_132x132.vp9
es/raw/vp90_2_02_size_132x132_vp9_md5
es/raw/vp90_2_02_size_16x08.vp9
es/raw/vp90_2_02_size_16x08_vp9_md5
es/raw/vp90_2_02_size_16x10.vp9
es/raw/vp90_2_02_size_16x10_vp9_md5
es/raw/vp90_2_02_size_16x16.vp9
es/raw/vp90_2_02_size_16x16_vp9_md5
es/raw/vp90_2_02_size_16x18.vp9
es/raw/vp90_2_02_size_16x18_vp9_md5
es/raw/vp90_2_02_size_16x32.vp9
es/raw/vp90_2_02_size_16x32_vp9_md5
es/raw/vp90_2_02_size_16x34.vp9
es/raw/vp90_2_02_size_16x34_vp9_md5
es/raw/vp90_2_02_size_16x64.vp9
es/raw/vp90_2_02_size_16x64_vp9_md5
es/raw/vp90_2_02_size_16x66.vp9
es/raw/vp90_2_02_size_16x66_vp9_md5
es/raw/vp90_2_02_size_178x180.vp9
es/raw/vp90_2_02_size_178x180_vp9_md5
es/raw/vp90_2_02_size_180x178.vp9
es/raw/vp90_2_02_size_180x178_vp9_md5
es/raw/vp90_2_02_size_180x180.vp9
es/raw/vp90_2_02_size_180x180_vp9_md5
es/raw/vp90_2_02_size_18x08.vp9
es/raw/vp90_2_02_size_18x08_vp9_md5
es/raw/vp90_2_02_size_18x10.vp9
es/raw/vp90_2_02_size_18x10_vp9_md5
es/raw/vp90_2_02_size_18x16.vp9
es/raw/vp90_2_02_size_18x16_vp9_md5
es/raw/vp90_2_02_size_18x18.vp9
es/raw/vp90_2_02_size_18x18_vp9_md5
es/raw/vp90_2_02_size_18x32.vp9
es/raw/vp90_2_02_size_18x32_vp9_md5
es/raw/vp90_2_02_size_18x34.vp9
es/raw/vp90_2_02_size_18x34_vp9_md5
es/raw/vp90_2_02_size_18x64.vp9
es/raw/vp90_2_02_size_18x64_vp9_md5
es/raw/vp90_2_02_size_18x66.vp9
es/raw/vp90_2_02_size_18x66_vp9_md5
es/raw/vp90_2_02_size_32x08.vp9
es/raw/vp90_2_02_size_32x08_vp9_md5
es/raw/vp90_2_02_size_32x10.vp9
es/raw/vp90_2_02_size_32x10_vp9_md5
es/raw/vp90_2_02_size_32x16.vp9
es/raw/vp90_2_02_size_32x16_vp9_md5
es/raw/vp90_2_02_size_32x18.vp9
es/raw/vp90_2_02_size_32x18_vp9_md5
es/raw/vp90_2_02_size_32x32.vp9
es/raw/vp90_2_02_size_32x32_vp9_md5
es/raw/vp90_2_02_size_32x34.vp9
es/raw/vp90_2_02_size_32x34_vp9_md5
es/raw/vp90_2_02_size_32x64.vp9
es/raw/vp90_2_02_size_32x64_vp9_md5
es/raw/vp90_2_02_size_32x66.vp9
es/raw/vp90_2_02_size_32x66_vp9_md5
es/raw/vp90_2_02_size_34x08.vp9
es/raw/vp90_2_02_size_34x08_vp9_md5
es/raw/vp90_2_02_size_34x10.vp9
es/raw/vp90_2_02_size_34x10_vp9_md5
es/raw/vp90_2_02_size_34x16.vp9
es/raw/vp90_2_02_size_34x16_vp9_md5
es/raw/vp90_2_02_size_34x18.vp9
es/raw/vp90_2_02_size_34x18_vp9_md5
es/raw/vp90_2_02_size_34x32.vp9
es/raw/vp90_2_02_size_34x32_vp9_md5
es/raw/vp90_2_02_size_34x34.vp9
es/raw/vp90_2_02_size_34x34_vp9_md5
es/raw/vp90_2_02_size_34x64.vp9
es/raw/vp90_2_02_size_34x64_vp9_md5
es/raw/vp90_2_02_size_34x66.vp9
es/raw/vp90_2_02_size_34x66_vp9_md5
es/raw/vp90_2_02_size_64x08.vp9
es/raw/vp90_2_02_size_64x08_vp9_md5
es/raw/vp90_2_02_size_64x10.vp9
es/raw/vp90_2_02_size_64x10_vp9_md5
es/raw/vp90_2_02_size_64x16.vp9
es/raw/vp90_2_02_size_64x16_vp9_md5
es/raw/vp90_2_02_size_64x18.vp9
es/raw/vp90_2_02_size_64x18_vp9_md5
es/raw/vp90_2_02_size_64x32.vp9
es/raw/vp90_2_02_size_64x32_vp9_md5
es/raw/vp90_2_02_size_64x34.vp9
es/raw/vp90_2_02_size_64x34_vp9_md5
es/raw/vp90_2_02_size_64x64.vp9
es/raw/vp90_2_02_size_64x64_vp9_md5
es/raw/vp90_2_02_size_64x66.vp9
es/raw/vp90_2_02_size_64x66_vp9_md5
es/raw/vp90_2_02_size_66x08.vp9
es/raw/vp90_2_02_size_66x08_vp9_md5
es/raw/vp90_2_02_size_66x10.vp9
es/raw/vp90_2_02_size_66x10_vp9_md5
es/raw/vp90_2_02_size_66x16.vp9
es/raw/vp90_2_02_size_66x16_vp9_md5
es/raw/vp90_2_02_size_66x18.vp9
es/raw/vp90_2_02_size_66x18_vp9_md5
es/raw/vp90_2_02_size_66x32.vp9
es/raw/vp90_2_02_size_66x32_vp9_md5
es/raw/vp90_2_02_size_66x34.vp9
es/raw/vp90_2_02_size_66x34_vp9_md5
es/raw/vp90_2_02_size_66x64.vp9
es/raw/vp90_2_02_size_66x64_vp9_md5
es/raw/vp90_2_02_size_66x66.vp9
es/raw/vp90_2_02_size_66x66_vp9_md5
es/raw/vp90_2_02_size_lf_1920x1080.vp9
es/raw/vp90_2_02_size_lf_1920x1080_vp9_md5
es/raw/vp90_2_03_deltaq.vp9
es/raw/vp90_2_03_deltaq_vp9_md5
es/raw/vp90_2_03_size_196x196.vp9
es/raw/vp90_2_03_size_196x196_vp9_md5
es/raw/vp90_2_03_size_196x198.vp9
es/raw/vp90_2_03_size_196x198_vp9_md5
es/raw/vp90_2_03_size_196x200.vp9
es/raw/vp90_2_03_size_196x200_vp9_md5
es/raw/vp90_2_03_size_196x202.vp9
es/raw/vp90_2_03_size_196x202_vp9_md5
es/raw/vp90_2_03_size_196x208.vp9
es/raw/vp90_2_03_size_196x208_vp9_md5
es/raw/vp90_2_03_size_196x210.vp9
es/raw/vp90_2_03_size_196x210_vp9_md5
es/raw/vp90_2_03_size_196x224.vp9
es/raw/vp90_2_03_size_196x224_vp9_md5
es/raw/vp90_2_03_size_196x226.vp9
es/raw/vp90_2_03_size_196x226_vp9_md5
es/raw/vp90_2_03_size_198x196.vp9
es/raw/vp90_2_03_size_198x196_vp9_md5
es/raw/vp90_2_03_size_198x198.vp9
es/raw/vp90_2_03_size_198x198_vp9_md5
es/raw/vp90_2_03_size_198x200.vp9
es/raw/vp90_2_03_size_198x200_vp9_md5
es/raw/vp90_2_03_size_198x202.vp9
es/raw/vp90_2_03_size_198x202_vp9_md5
es/raw/vp90_2_03_size_198x208.vp9
es/raw/vp90_2_03_size_198x208_vp9_md5
es/raw/vp90_2_03_size_198x210.vp9
es/raw/vp90_2_03_size_198x210_vp9_md5
es/raw/vp90_2_03_size_198x224.vp9
es/raw/vp90_2_03_size_198x224_vp9_md5
es/raw/vp90_2_03_size_198x226.vp9
es/raw/vp90_2_03_size_198x226_vp9_md5
es/raw/vp90_2_03_size_200x196.vp9
es/raw/vp90_2_03_size_200x196_vp9_md5
es/raw/vp90_2_03_size_200x198.vp9
es/raw/vp90_2_03_size_200x198_vp9_md5
es/raw/vp90_2_03_size_200x200.vp9
es/raw/vp90_2_03_size_200x200_vp9_md5
es/raw/vp90_2_03_size_200x202.vp9
es/raw/vp90_2_03_size_200x202_vp9_md5
es/raw/vp90_2_03_size_200x208.vp9
es/raw/vp90_2_03_size_200x208_vp9_md5
es/raw/vp90_2_03_size_200x210.vp9
es/raw/vp90_2_03_size_200x210_vp9_md5
es/raw/vp90_2_03_size_200x224.vp9
es/raw/vp90_2_03_size_200x224_vp9_md5
es/raw/vp90_2_03_size_200x226.vp9
es/raw/vp90_2_03_size_200x226_vp9_md5
es/raw/vp90_2_03_size_202x196.vp9
es/raw/vp90_2_03_size_202x196_vp9_md5
es/raw/vp90_2_03_size_202x198.vp9
es/raw/vp90_2_03_size_202x198_vp9_md5
es/raw/vp90_2_03_size_202x200.vp9
es/raw/vp90_2_03_size_202x200_vp9_md5
es/raw/vp90_2_03_size_202x202.vp9
es/raw/vp90_2_03_size_202x202_vp9_md5
es/raw/vp90_2_03_size_202x208.vp9
es/raw/vp90_2_03_size_202x208_vp9_md5
es/raw/vp90_2_03_size_202x210.vp9
es/raw/vp90_2_03_size_202x210_vp9_md5
es/raw/vp90_2_03_size_202x224.vp9
es/raw/vp90_2_03_size_202x224_vp9_md5
es/raw/vp90_2_03_size_202x226.vp9
es/raw/vp90_2_03_size_202x226_vp9_md5
es/raw/vp90_2_03_size_208x196.vp9
es/raw/vp90_2_03_size_208x196_vp9_md5
es/raw/vp90_2_03_size_208x198.vp9
es/raw/vp90_2_03_size_208x198_vp9_md5
es/raw/vp90_2_03_size_208x200.vp9
es/raw/vp90_2_03_size_208x200_vp9_md5
es/raw/vp90_2_03_size_208x202.vp9
es/raw/vp90_2_03_size_208x202_vp9_md5
es/raw/vp90_2_03_size_208x208.vp9
es/raw/vp90_2_03_size_208x208_vp9_md5
es/raw/vp90_2_03_size_208x210.vp9
es/raw/vp90_2_03_size_208x210_vp9_md5
es/raw/vp90_2_03_size_208x224.vp9
es/raw/vp90_2_03_size_208x224_vp9_md5
es/raw/vp90_2_03_size_208x226.vp9
es/raw/vp90_2_03_size_208x226_vp9_md5
es/raw/vp90_2_03_size_210x196.vp9
es/raw/vp90_2_03_size_210x196_vp9_md5
es/raw/vp90_2_03_size_210x198.vp9
es/raw/vp90_2_03_size_210x198_vp9_md5
es/raw/vp90_2_03_size_210x200.vp9
es/raw/vp90_2_03_size_210x200_vp9_md5
es/raw/vp90_2_03_size_210x202.vp9
es/raw/vp90_2_03_size_210x202_vp9_md5
es/raw/vp90_2_03_size_210x208.vp9
es/raw/vp90_2_03_size_210x208_vp9_md5
es/raw/vp90_2_03_size_210x210.vp9
es/raw/vp90_2_03_size_210x210_vp9_md5
es/raw/vp90_2_03_size_210x224.vp9
es/raw/vp90_2_03_size_210x224_vp9_md5
es/raw/vp90_2_03_size_210x226.vp9
es/raw/vp90_2_03_size_210x226_vp9_md5
es/raw/vp90_2_03_size_224x196.vp9
es/raw/vp90_2_03_size_224x196_vp9_md5
es/raw/vp90_2_03_size_224x198.vp9
es/raw/vp90_2_03_size_224x198_vp9_md5
es/raw/vp90_2_03_size_224x200.vp9
es/raw/vp90_2_03_size_224x200_vp9_md5
es/raw/vp90_2_03_size_224x202.vp9
es/raw/vp90_2_03_size_224x202_vp9_md5
es/raw/vp90_2_03_size_224x208.vp9
es/raw/vp90_2_03_size_224x208_vp9_md5
es/raw/vp90_2_03_size_224x210.vp9
es/raw/vp90_2_03_size_224x210_vp9_md5
es/raw/vp90_2_03_size_224x224.vp9
es/raw/vp90_2_03_size_224x224_vp9_md5
es/raw/vp90_2_03_size_224x226.vp9
es/raw/vp90_2_03_size_224x226_vp9_md5
es/raw/vp90_2_03_size_226x196.vp9
es/raw/vp90_2_03_size_226x196_vp9_md5
es/raw/vp90_2_03_size_226x198.vp9
es/raw/vp90_2_03_size_226x198_vp9_md5
es/raw/vp90_2_03_size_226x200.vp9
es/raw/vp90_2_03_size_226x200_vp9_md5
es/raw/vp90_2_03_size_226x202.vp9
es/raw/vp90_2_03_size_226x202_vp9_md5
es/raw/vp90_2_03_size_226x208.vp9
es/raw/vp90_2_03_size_226x208_vp9_md5
es/raw/vp90_2_03_size_226x210.vp9
es/raw/vp90_2_03_size_226x210_vp9_md5
es/raw/vp90_2_03_size_226x224.vp9
es/raw/vp90_2_03_size_226x224_vp9_md5
es/raw/vp90_2_03_size_226x226.vp9
es/raw/vp90_2_03_size_226x226_vp9_md5
es/raw/vp90_2_06_bilinear.vp9
es/raw/vp90_2_06_bilinear_vp9_md5
es/raw/vp90_2_07_frame_parallel.vp9
es/raw/vp90_2_07_frame_parallel_1.vp9
es/raw/vp90_2_07_frame_parallel_1_vp9_md5
es/raw/vp90_2_07_frame_parallel_vp9_md5
es/raw/vp90_2_08_tile_1x2.vp9
es/raw/vp90_2_08_tile_1x2_frame_parallel.vp9
es/raw/vp90_2_08_tile_1x2_frame_parallel_vp9_md5
es/raw/vp90_2_08_tile_1x2_vp9_md5
es/raw/vp90_2_08_tile_1x4.vp9
es/raw/vp90_2_08_tile_1x4_frame_parallel.vp9
es/raw/vp90_2_08_tile_1x4_frame_parallel_vp9_md5
es/raw/vp90_2_08_tile_1x4_vp9_md5
es/raw/vp90_2_08_tile_1x8.vp9
es/raw/vp90_2_08_tile_1x8_frame_parallel.vp9
es/raw/vp90_2_08_tile_1x8_frame_parallel_vp9_md5
es/raw/vp90_2_08_tile_1x8_vp9_md5
es/raw/vp90_2_08_tile_4x1.vp9
es/raw/vp90_2_08_tile_4x1_vp9_md5
es/raw/vp90_2_08_tile_4x4.vp9
es/raw/vp90_2_08_tile_4x4_vp9_md5
es/raw/vp90_2_09_aq2.vp9
es/raw/vp90_2_09_aq2_vp9_md5
es/raw/vp90_2_09_lf_deltas.vp9
es/raw/vp90_2_09_lf_deltas_vp9_md5
es/raw/vp90_2_09_subpixel_00.vp9
es/raw/vp90_2_09_subpixel_00_vp9_md5
es/raw/vp90_2_10_show_existing_frame.vp9
es/raw/vp90_2_10_show_existing_frame2.vp9
es/raw/vp90_2_10_show_existing_frame2_vp9_md5
es/raw/vp90_2_10_show_existing_frame_vp9_md5
es/raw/vp90_2_12_droppable_1.vp9
es/raw/vp90_2_12_droppable_1_vp9_md5
es/raw/vp90_2_12_droppable_2.vp9
es/raw/vp90_2_12_droppable_2_vp9_md5
es/raw/vp90_2_12_droppable_3.vp9
es/raw/vp90_2_12_droppable_3_vp9_md5
es/raw/vp90_2_15_segkey.vp9
es/raw/vp90_2_15_segkey_adpq.vp9
es/raw/vp90_2_15_segkey_adpq_vp9_md5
es/raw/vp90_2_15_segkey_vp9_md5
es/raw/vp90_2_16_intra_only.vp9
es/raw/vp90_2_16_intra_only_vp9_md5
es/raw/vp90_2_17_show_existing_frame.vp9
es/raw/vp90_2_17_show_existing_frame_vp9_md5
es/raw/vp90_2_19_skip.vp9
es/raw/vp90_2_19_skip_01.vp9
es/raw/vp90_2_19_skip_01_vp9_md5
es/raw/vp90_2_19_skip_02.vp9
es/raw/vp90_2_19_skip_02_vp9_md5
es/raw/vp90_2_19_skip_vp9_md5
es/raw/vp90_2_20_big_superframe_01.vp9
es/raw/vp90_2_20_big_superframe_01_vp9_md5
es/raw/vp90_2_20_big_superframe_02.vp9
es/raw/vp90_2_20_big_superframe_02_vp9_md5
es/raw/vp9_test_vectors
rc/android/media/cts/DecoderConformanceTest.java
c3ec3a0dcb4c26c41ae12fb5ad148cc1060a22b0 26-May-2016 Robert Shih <robertshih@google.com> Merge "Add decoder conformance CTS test framework." into nyc-dev
024cdf9c2c9373b4d55e7f5d16fe2c9a5f591586 26-May-2016 Hangyu Kuang <hkuang@google.com> Merge "media: Add test to verify the color aspects handling of various codecs." into nyc-dev
fa52eb180364b3ebf5c085d0d08b74259e96c5c3 25-May-2016 Hangyu Kuang <hkuang@google.com> media: Add test to verify the color aspects handling of various codecs.

Bug:28961357

Change-Id: Ib888d7cc84ce0d1c1725ff13252d282659d37e56
es/raw/color_176x144_bt709_lr_sdr_h264.mp4
rc/android/media/cts/DecoderTest.java
86a6f120c604645089393b4badc60039bcc44897 30-Dec-2015 Hangyu Kuang <hkuang@google.com> Add decoder conformance CTS test framework.

This framework requires per codec a list of test vectors and their
corresponding frame-by-frame checksum (not included in this commit). The
test currently always passes and generates an xml report listing
individual vector pass/fails.

Bug: 27484784
Change-Id: I5d271461d5d45135158a35c4256e2c1e80777bf8
rc/android/media/cts/CodecUtils.java
rc/android/media/cts/DecoderConformanceTest.java
2f5f324f4baf89e98db6dad13380140fd0c1ddd1 23-May-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioRecordingConfiguration test: update for API change" into nyc-dev
5f8b5dc88aafc95c78507280efe1251eb5871f5a 20-May-2016 Pawin Vongmasa <pawin@google.com> Add texture coordinate transformation before rendering.

GLSurfaceViewFactory.GLSurfaceViewThread
- Add member variable textureTransform to hold the transformation
matrix. It is updated within onFrameAvailable() before
drawFrame() is called, and it is used in VERTEX_SHADER.

Bug: 28823378
Bug: 27589011
Change-Id: I480f4419725c6312f649cd9ea3db16a0a56842a2
rc/android/media/cts/DecodeAccuracyTestBase.java
b19f5da083b3df545965bb377a9022f7b9461db4 20-May-2016 Jean-Michel Trivi <jmtrivi@google.com> AudioRecordingConfiguration test: update for API change

Update AudioRecordingConfigurationTest to account for API change
where arrays of AudioRecordingConfiguration instances are now
in lists.

Bug 28819230

Change-Id: I01a21057b1e14e50636bba90a12fe781d1656ae0
rc/android/media/cts/AudioRecordingConfigurationTest.java
beade775b1ed693de2aa63ae21862170f4cff0ce 19-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix RingtoneTest and RingtoneManagerTest" into nyc-dev
6ac62af4db1fb84347a3e17d9674d4c6e7db1267 19-May-2016 Nicholas Sauer <nicksauer@google.com> Fix RingtoneTest and RingtoneManagerTest

When the volume of the device is set to 0, these tests will fail during
setup.
bug: 27814247

Change-Id: I87c7a50775ed4edd99e2ba0e93636454e89278d3
rc/android/media/cts/RingtoneManagerTest.java
rc/android/media/cts/RingtoneTest.java
0c76db284ea60684a233468b95477a74b5b61217 18-May-2016 Ricardo Garcia <rago@google.com> Merge "Fix for AudioNativeTest Input and Output ChannelMasks tests" into nyc-dev
9b8a28e85d1b0297e6e4471d56640abe16af2fa9 18-May-2016 rago <rago@google.com> Fix for AudioNativeTest Input and Output ChannelMasks tests

Bug: 28797587
Change-Id: Iba984dc126ab4ae76bf556d204429a7c1478df3f
rc/android/media/cts/AudioNativeTest.java
888a82077328a85deb845dcf088365c68d7d9a42 17-May-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Fix missing patches in LoudnessEnhancerTest" into nyc-dev
cea90b5de4bd499d7c25e34c5377d36870f8f2bf 17-May-2016 Jia Zhao <jiaqzhao@google.com> Merge "Remove TextureView tests." into nyc-dev
d65fda34d9ddff1f5c660f4a2a2064ca07f6aade 16-May-2016 Jia Zhao <jiaqzhao@google.com> Remove TextureView tests.

Removing the TextureView tests because GLView tests cover similar
aspects of the decoders, it also removes the dependency on the
screen.
b/28377691

Change-Id: Ia287e1cc9bb549755bc9bace2457c199c4a7d273
rc/android/media/cts/DecodeAccuracyTest.java
ece6ecabd2249590c71756576af5612eba5ee5e8 13-May-2016 Lajos Molnar <lajos@google.com> media: log more details for getAchievableRates

Also, log them into logcat as the logs are not available for passing tests.

Bug: 28752802
Change-Id: I3797d5ccb3ea99fff84a85b8eceea739a6f60667
rc/android/media/cts/VideoDecoderPerfTest.java
49ea713a218006f796051dcf441327a67bdff143 11-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add CTS media tests for FEATURE_VR_MODE_HIGH_PERFORMANCE." into nyc-dev
98a6ab527a803b0299302aceb72edb7fbedebc30 10-May-2016 Gaurav Mishra <mishragaurav@google.com> Merge "Migrate test classes from deprecated ReportLogs." into nyc-dev
a34e9c622e364890b7cd61b4b6f72603d7bc350d 10-May-2016 Gaurav Mishra <mishragaurav@google.com> Migrate test classes from deprecated ReportLogs.

Bug:28643968
Bug:27950009
Bug:27925818
Change-Id: I0b3761532ec5cc16ac07e322e9ed1d57071bbb9a
rc/android/media/cts/VideoDecoderPerfTest.java
2681131e2739edaf0115161016e5fd8ad2f4fd87 05-May-2016 Andrew Scherkus <scherkus@google.com> Add CTS media tests for FEATURE_VR_MODE_HIGH_PERFORMANCE.

Tests perform sanity checks on H264, HEVC, and VP9 codec capabilities.

If a codec claims to be VR ready, performs a decode test.

Bug: 27948493
Change-Id: Ic75475ff9e773da585bcb6275a2d1095c40bf7fa
rc/android/media/cts/DecoderTest.java
13f91d9c0761388b58426f7022b42ad504048c4c 09-May-2016 Jean-Michel Trivi <jmtrivi@google.com> Fix missing patches in LoudnessEnhancerTest

The lollipop-mr1-cts-dev branch and internal m/nyc branches
have diverged for LoudnessEnhancerTest. This patch
restores missing updates:
- only run tests on devices with audio output (no need for
a LoudnessEnhancer effect if the device has no audio output)
- restore the tests related to enabling the effect
- use the audio file "sine1khzm40db" which is 5s long
- fix test log tag
- replace useless sleep loop with a sleep of the same duration

Bug 28476380

Change-Id: Ie653f4e790d64a67adc81aa6013e873665440495
rc/android/media/cts/LoudnessEnhancerTest.java
7e00c35fb0791062c673ec3a65d55f69a97eecd5 09-May-2016 Yin-Chia Yeh <yinchiayeh@google.com> resolve merge conflicts of 8239ddf to nyc-dev

Change-Id: I2d82b6edc8862f3977e7d28519dba423088f62e1
ac8849b7b28260bd867d5c7ef51b3cc6e9ad31cc 09-May-2016 Andy Hung <hunga@google.com> Merge "Improve robustness of MediaSyncTest" into nyc-dev
d3b47cce9d348b9b9fd29bcaab3f67c5ffdecae2 08-May-2016 Chaofeng Li <lee.chaofeng@huawei.com> MediaRecorderTest: fix supported video size logic

Fix MediaRecorderTest when getSupportedVideoSizes returns null
as well as MediaPlayerTest in Change-Id Iee3b681

Change-Id: I0a1c313eb39e2c8c2d61c1dd828cdef9fe0ceec7
rc/android/media/cts/MediaRecorderTest.java
160502a5cd7cedd292f6d5e507e74268cdeb4461 07-May-2016 Andy Hung <hunga@google.com> Improve robustness of MediaSyncTest

Bug: 28579467
Change-Id: I49151792f1179d50b1c5ed7995705c5bdcc61303
rc/android/media/cts/MediaSyncTest.java
b6fe2483e778f14e8b385bf3b3c1d739e96ce073 06-May-2016 Mahammedsuhel Shaikh <Mahammedsuhel.Shaikh@Symphonyteleca.com> Merge "Fix EncodeDecodeTest checkFrame" into lollipop-mr1-cts-dev
am: 2fa32a8ef1

* commit '2fa32a8ef186670876b3cc6c72fd76bdad6a2625':
Fix EncodeDecodeTest checkFrame

Change-Id: I1867c3c76ea4cd114e9c717ec2d6676f5c9ab3ad
2fa32a8ef186670876b3cc6c72fd76bdad6a2625 06-May-2016 Daniel Xie <dxie@google.com> Merge "Fix EncodeDecodeTest checkFrame" into lollipop-mr1-cts-dev
039de8940af88fdd525b775461e817a73ee0aae1 04-May-2016 Phil Burk <philburk@google.com> Merge "CTS: test AudioTrack bufferSize" into nyc-dev
fde73ed3b4cc4c46a1e3ba915b6b5dfeb97883ee 21-Apr-2016 Phil Burk <philburk@google.com> CTS: test AudioTrack bufferSize

Try various legal and illegal values.

Bug: 28321706
Change-Id: I56856bc2925e949cd1bd3193addabda5c6ace295
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/AudioTrackLatencyTest.java
c30b7589ea8c6fe606f00a8952976a7f3cbfa11f 02-May-2016 Jean-Michel Trivi <jmtrivi@google.com> Add tests for android.media.AudioRouting

Add tests for android.media.AudioRouting through AudioTrack
and AudioRecord: for each routing listener test on the deprecated
routing interfaces (AudioTrack.OnRoutingChangedListener and
AudioRecord.OnRoutingChangedListener), add alternate code
exercising the AudioRouting interface as exposed by AudioTrack
and AudioRecord.

Change-Id: I10896a01880002533c0147d756e4d3938d541147
rc/android/media/cts/RoutingTest.java
0b7b5be9a81c9a462b564a390a8f3dc0ceac31b8 28-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> resolve merge conflicts of db87b52 to nyc-dev

Change-Id: I9c60b34cae2ea050bd68c7eba31566e3c2112b7d
ab3a84a0b664ebf4453e1d0b77a240092579507a 28-Apr-2016 Daniel Xie <dxie@google.com> Merge "MediaPlayerTest: fix supported video size logic" into marshmallow-cts-dev
640e77169f030cb87048c6f4db168300b37f9631 27-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> MediaPlayerTest: fix supported video size logic

Change-Id: Iee3b681c388bde99d9b2f496008fe6b9ff7545fb
rc/android/media/cts/MediaPlayerTest.java
1f2cd960c6503c7f0c1b8e540a2df4a2c38c3351 08-Apr-2016 Julia Reynolds <juliacr@google.com> DND related audio service tests.

- Apps without dnd access cannot call adjuststeamvolume if that will
change the ringer mode
- DND muted streams cannot be unmuted when DND total silence is enabled.

Fixes: 28406721
Bug: 27624414
Bug: 25395278

Change-Id: I049951e6b043b7410c238db37bae2e391eb10ad9
rc/android/media/cts/AudioManagerTest.java
f51f635086ccef121f97f2e8f36b7c16efb4db8c 25-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add CTS for MediaBrowserService.getBrowserRootHints" into nyc-dev
9ed4bc2a31c5f96ef7a1b7f3eadd7a8c0812f211 23-Apr-2016 Andy Hung <hunga@google.com> Merge "Adjust tolerance for AudioTrackSurroundTest#testPlaySineSweepShorts" into nyc-dev
79e882cb9178b0f6d33f4158ef5628bf09573e82 22-Apr-2016 Andy Hung <hunga@google.com> Merge "Fix EncodeDecodeTest checkFrame" into nyc-dev
6c555dec08d3860c6c6e79d6cd339c074a1005fb 22-Apr-2016 Andy Hung <hunga@google.com> Adjust tolerance for AudioTrackSurroundTest#testPlaySineSweepShorts

Bug: 28250436
Change-Id: I8ae573ce95dd77377ecae447bb2c3414eb08d542
rc/android/media/cts/AudioTrackSurroundTest.java
d385db467a0f84a52caddb2ff89d3f9116b91544 22-Apr-2016 Mikhail Naganov <mnaganov@google.com> Increase SoundPool loading timeout

Due to separation of the media codec framework code between
processes, loading and decoding of samples started taking more
time, causing the test to timeout.

A quick fix for this is to just increase the timeout.
A long term fix would be to make SoundPool more efficient --
currently it loads all the samples one by one, whereas
the codec framework actually creates a thread for each
sample, so some of them can be actually processed in parallel.

Bug: 28220294
Change-Id: Ia86626f97f019399452ab16572d9db69cd630ab3
rc/android/media/cts/SoundPoolTest.java
1c4f2f676dcb895b64af8e3e7bac729296751907 14-Apr-2016 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaBrowserService.getBrowserRootHints

Bug: 28075963
Change-Id: I148f3e08d06cc1ed1291811ef508e7e1d4551675
rc/android/media/cts/MediaBrowserServiceTest.java
rc/android/media/cts/StubMediaBrowserService.java
6179584de5814c72ce21d2c1ad7ea8cf282b4b04 19-Apr-2016 Nicholas Sauer <nicksauer@google.com> [CTS] Set timeouts for tests running in CTSv2

bug:28274736
Change-Id: I2361fbad20bc08b2ef996a29967be10bbd9cbf19
ndroidTest.xml
5307f128ca8dc54f506d92ab42580144f7f78318 19-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "media: calculate duration tolerance for recorded video by frames" into nyc-dev
5a6e47228f31281b151be30f3ef9eee95e25ec60 18-Apr-2016 Mahammedsuhel Shaikh <Mahammedsuhel.Shaikh@Symphonyteleca.com> Fix EncodeDecodeTest checkFrame

Needs to obey MediaFormat KEY_STRIDE and KEY_SLICE_HEIGHT if present as
extra padding may be added by the HW decoder.

Bug: 27899286
Change-Id: I4d77215853013037cc5eda4d151dfcad8179a087
Signed-off-by: Mahammedsuhel Shaikh <Mahammedsuhel.Shaikh@Symphonyteleca.com>
rc/android/media/cts/EncodeDecodeTest.java
4fac0d114cfd72b42d31a9eff7c21b6fcc323b13 18-Apr-2016 Mahammedsuhel Shaikh <Mahammedsuhel.Shaikh@Symphonyteleca.com> Fix EncodeDecodeTest checkFrame

Needs to obey MediaFormat KEY_STRIDE and KEY_SLICE_HEIGHT if present as
extra padding may be added by the HW decoder.

Bug: 27899286
Change-Id: I4d77215853013037cc5eda4d151dfcad8179a087
Signed-off-by: Mahammedsuhel Shaikh <Mahammedsuhel.Shaikh@Symphonyteleca.com>
rc/android/media/cts/EncodeDecodeTest.java
e9906266f9bc840360771bfb1565eeba220a39bb 18-Apr-2016 Daniel Xie <dxie@google.com> Merge "Revert "Obtain min frame rate from codec capabilities"" into marshmallow-cts-dev am: adb9a03 am: 9a5ff6b am: 13b8b48 am: c01e1b7
am: 803b37f

* commit '803b37fc881dcfdb6a1587a70faedeac3cdbbfa1':
Revert "Obtain min frame rate from codec capabilities"

Change-Id: I77f1a00af72f25d17b630a5c384f265d7dbcc11c
adb9a03ad58c4a503835af4ccc5e04bf316930c6 18-Apr-2016 Daniel Xie <dxie@google.com> Merge "Revert "Obtain min frame rate from codec capabilities"" into marshmallow-cts-dev
028120e0e80bb39e2daedf949ff149fa3dc58fcf 18-Apr-2016 Daniel Xie <dxie@google.com> Revert "Obtain min frame rate from codec capabilities"

This reverts commit 6012a99d70b8829aaebb235daadedeb324ba0abf.

Change-Id: Iaea89f966d349871555cbb6cad48d9d15bf046b7
rc/android/media/cts/MediaCodecCapabilitiesTest.java
ebce0cb59326bf213c76cc227a745c97167334eb 11-Apr-2016 Wonsik Kim <wonsik@google.com> media: calculate duration tolerance for recorded video by frames

Bug: 28093872
Change-Id: I2d650689053cad9c558486a8ce1d35dff5853d1f
rc/android/media/cts/MediaRecorderTest.java
0cb565cd94cc1764095687927f38e3aeb228e6de 13-Apr-2016 Edwin Wong <edwinwong@google.com> Shorten testClearKeyPlayback to 25 seconds.

Many failures seem to be due to poor network connection, causing test to timeout.
Shorten the test to 25 seconds, same as the refactored GTS tests. This time is
sufficient to test the decryption path.

bug: 26917432
Change-Id: Iaee8a935a93bcbc0ac0624443f2f28ce19b66791
rc/android/media/cts/ClearKeySystemTest.java
93405870cee9c72f302b022e8b405cd7be3d5f23 11-Apr-2016 Warren Rehman <wrehman@google.com> Merge "Obtain min frame rate from codec capabilities" into marshmallow-cts-dev am: 85f2b32 am: 19b9e44 am: 4a10f46 am: c379108
am: d33ec4c

* commit 'd33ec4c0f7eecfa06f23f255635465263a2efcb3':
Obtain min frame rate from codec capabilities

Change-Id: I7a6e12619a8f0eaeec337e9af4d74ab9f90d7d6c
c01cfd4fcc64b4926e1bee9ad6743dbd90f665ad 11-Apr-2016 Andy Hung <hunga@google.com> resolve merge conflicts of 83b2fd1 to nyc-dev

Change-Id: I002416596c80860fa405d4c130a3365361e089ce
85f2b32cff6bfdc579e3bf7e8d4dd7b751962d7d 11-Apr-2016 Daniel Xie <dxie@google.com> Merge "Obtain min frame rate from codec capabilities" into marshmallow-cts-dev
a979ff93b907d53e31e96e81bf079ca772be34d0 11-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "media: release reclaimed codec in ResourceManagerTest" into nyc-dev
7da1be18882701478717acc2297d6cb8efa03305 08-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add AAC decoding tests" into nyc-dev
72af345f46cb213169fa59765df05a18d7f238ad 08-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add tearDown() to AudioEffectTest" into nyc-dev
bc1041ebd3f560ccbb0f7b85430c03889c322e72 08-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Add tearDown() to AudioEffectTest

Numerous AudioEffect tests can fail without clean up of the
resources they allocated (effect, looper, media player). Make
sure we always clean up after a test.
This doesn't fix any root cause of test failures but ensures
subsequent tests won't fail later because of unreleased resources.

Bug 24497555

Change-Id: Idb71a43cc6916160655bb730105f4008213e907d
rc/android/media/cts/AudioEffectTest.java
e427e3d0a368fc0703913fd170570fa9603a8302 07-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Add AAC decoding tests

Test name AAC variant Channels Test proc
testDecodeAacLcM4a AAC-LC 1, 2 refComp
testDecodeAacLcMcM4a AAC-LC 5.0, 5.1 nrgTest
testDecodeHeAacM4a HE-AAC 1, 2 nrgTest
testDecodeHeAacMcM4a HE-AAC 5.0, 5.1 nrgTest
testDecodeHeAacV2M4a HE-AAC v2 2 nrgTest
testDecodeAacEldM4a AAC-ELD 1, 2 refComp, nrgTest

A/ refComp test procedure:

All media files associated with this test have been encoded from the same reference waveform.
The test compares the decoded output from DUT for each media file with the reference.
It subtracts the output samples from the reference and calculates the RMS of the resulting
error signal. A certain RMS value limit is defined. For the newly added media files the
threshold is set to 40.0.

B/ nrgTest test procedure: segmented energy analysis

All media files for this test can be subdivided into equally sized segments. Each channel signal
has some segments with lowpass filtered noise and the same amount of segments with high-pass filtered
noise having approximately the same energy per segment.
The test routine subdivides the decoded output signal for each media file and measures the
energy of each segment in every channel. The test verifies that the ratio of the minimum and
maximum segment energy (in a specified signal area) in no single channel falls below the
threshold of 0.5.
The media files have been encoded in a way that the high-pass filtered noise segments can only
be reproduced using SBR. If the SBR tool is not (fully) implemented, the high-pass filtered
noise will be absent in the decoded output and the energies for these segments fall close to
zero. In this case the segment energy ratio falls below the threshold and the test will fail.

signal structure:
Structure of a valid multi-channel input signal for SBR testing (example 5.1 channels):
L HHHH high-band
XXXX____________________________________ low-band
R HHHH high-band
________XXXX____________________________ low-band
C HHHH high-band
________________XXXX____________________ low-band
LFE high-band
________________________________________ low-band
Ls HHHH high-band
________________________XXXX____________ low-band
Rs HHHH high-band
________________________________XXXX____ low-band

Structure of a two channel input signal optimized for PS testing
L HHHH HHHH high-band
XXXX____XXXX____ low-band
R HHHH high-band
________XXXX____ low-band

Each "X" character represents one segment with low-pass filtered noise.
The "H" characters represent segments with high-pass filtered noise.
Segments with approximately zero energy are depicted by "_" characters.

Each segment has the size of fs/4 samples, where fs is the sampling frequency of the signal.
The signal length grows with the number of channels that have a signal. The minimum is
eight segments, which correspond to 2 ∗ fs samples for a one channel signal. Each
additional channel (except the LFE) adds another eight segments to the total length.
So the global equation to calculate the signal length is n ∗ 8 ∗ fs/4 = n ∗ 2 ∗ fs,
where n is the number of channels. Note that for all associated media files the LFE
channel never has signal. Thus it does not increase the expected signal length.

Bug 25842037

Change-Id: I7a99d221b9beeba815edd4a8bb58a9116d3d7691
es/raw/noise_1ch_16khz_aot39_ds_sbr_fl512_mp4.m4a
es/raw/noise_1ch_24khz_aot39_ds_sbr_fl512_mp4.m4a
es/raw/noise_1ch_24khz_aot5_dr_sbr_sig1_mp4.m4a
es/raw/noise_1ch_24khz_aot5_ds_sbr_sig1_mp4.m4a
es/raw/noise_1ch_32khz_aot39_dr_sbr_fl480_mp4.m4a
es/raw/noise_1ch_32khz_aot5_dr_sbr_sig2_mp4.m4a
es/raw/noise_1ch_44khz_aot39_ds_sbr_fl512_mp4.m4a
es/raw/noise_1ch_44khz_aot5_dr_sbr_sig0_mp4.m4a
es/raw/noise_1ch_44khz_aot5_ds_sbr_sig2_mp4.m4a
es/raw/noise_1ch_48khz_aot39_dr_sbr_fl480_mp4.m4a
es/raw/noise_2ch_22khz_aot39_ds_sbr_fl512_mp4.m4a
es/raw/noise_2ch_24khz_aot29_dr_sbr_sig0_mp4.m4a
es/raw/noise_2ch_24khz_aot5_dr_sbr_sig2_mp4.m4a
es/raw/noise_2ch_32khz_aot39_ds_sbr_fl512_mp4.m4a
es/raw/noise_2ch_32khz_aot5_ds_sbr_sig2_mp4.m4a
es/raw/noise_2ch_44khz_aot29_dr_sbr_sig1_mp4.m4a
es/raw/noise_2ch_44khz_aot39_dr_sbr_fl480_mp4.m4a
es/raw/noise_2ch_48khz_aot29_dr_sbr_sig2_mp4.m4a
es/raw/noise_2ch_48khz_aot39_ds_sbr_fl512_mp4.m4a
es/raw/noise_2ch_48khz_aot5_dr_sbr_sig1_mp4.m4a
es/raw/noise_2ch_48khz_aot5_ds_sbr_sig1_mp4.m4a
es/raw/noise_5ch_44khz_aot2_mp4.m4a
es/raw/noise_5ch_48khz_aot5_dr_sbr_sig1_mp4.m4a
es/raw/noise_6ch_44khz_aot5_dr_sbr_sig2_mp4.m4a
es/raw/noise_6ch_48khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_11khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_12khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_16khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_16khz_aot39_fl480_mp4.m4a
es/raw/sinesweep1_1ch_22khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_22khz_aot39_fl512_mp4.m4a
es/raw/sinesweep1_1ch_24khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_24khz_aot39_fl480_mp4.m4a
es/raw/sinesweep1_1ch_32khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_32khz_aot39_fl512_mp4.m4a
es/raw/sinesweep1_1ch_44khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_44khz_aot39_fl480_mp4.m4a
es/raw/sinesweep1_1ch_48khz_aot2_mp4.m4a
es/raw/sinesweep1_1ch_48khz_aot39_fl512_mp4.m4a
es/raw/sinesweep1_1ch_8khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_11khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_12khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_16khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_16khz_aot39_fl512_mp4.m4a
es/raw/sinesweep_2ch_22khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_22khz_aot39_fl480_mp4.m4a
es/raw/sinesweep_2ch_24khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_24khz_aot39_fl512_mp4.m4a
es/raw/sinesweep_2ch_32khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_32khz_aot39_fl480_mp4.m4a
es/raw/sinesweep_2ch_44khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_44khz_aot39_fl512_mp4.m4a
es/raw/sinesweep_2ch_48khz_aot2_mp4.m4a
es/raw/sinesweep_2ch_48khz_aot39_fl480_mp4.m4a
es/raw/sinesweep_2ch_8khz_aot2_mp4.m4a
rc/android/media/cts/DecoderTest.java
a0322dd561e480d34d07eb2a8927f2acb710bb23 19-Mar-2016 Andy Hung <hunga@google.com> Fix DecoderTest#testTunneledVideoPlayback

Bug: 22978539
Bug: 26771316
Change-Id: I5e33a582b66a121b91a5ea90c7f143db49296aa3
rc/android/media/cts/CodecState.java
rc/android/media/cts/DecoderTest.java
e1c23aca462de46a05a08eba33e9cc0b495df039 07-Apr-2016 Marco Nelissen <marcone@google.com> Test for AMRWB overflow

Bug: 27898843
Change-Id: Ice93af32e5904a6ab4ee4c7d0fa165c01a67e3ad
es/raw/tones.wav
rc/android/media/cts/EncoderTest.java
d539d1a41b920e0e2eb0b7b914b997e5e07c615f 07-Apr-2016 Wonsik Kim <wonsik@google.com> media: release reclaimed codec in ResourceManagerTest

Bug: 28028908
Change-Id: I942480729c94424e9501ee7fabcdef5938c334bd
rc/android/media/cts/ResourceManagerTestActivityBase.java
50fecbc4f0f9182d2c7a262a0c3a22e94679ac6c 06-Apr-2016 Andy Hung <hunga@google.com> Merge "MediaPlayerTest: Fix testGaplessPlayback" into nyc-dev
522f145af3434a7ab7cbe5d823c80d0aaf7a9779 06-Apr-2016 Andy Hung <hunga@google.com> MediaPlayerTest: Fix testGaplessPlayback

DND mode prevents change of ringer mode.
Also allow releasing resources on failure.

Bug: 27925014
Change-Id: I4c295c0b1f0a137fd4811b982217a6e7178e42e5
rc/android/media/cts/MediaPlayerTest.java
6012a99d70b8829aaebb235daadedeb324ba0abf 31-Mar-2016 Warren Rehman <wrehman@google.com> Obtain min frame rate from codec capabilities

Instead of hardcoded 10fps, inspect codec capabilities to determine min rate.

Bug: 27532401
Change-Id: I1c400f9789dd71ea0605a796ebdd405ecaf170d1
rc/android/media/cts/MediaCodecCapabilitiesTest.java
b03b86a5a797da737be48f87b2afea0ba4d916c3 05-Apr-2016 Marco Nelissen <marcone@google.com> Fix MediaScannerConnectionTest

World-readable private files are no longer supported, so use a file
in external storage instead.

Bug: 26741694
Change-Id: Id1a4f019040fc582e323f88d6340587c507f52f1
rc/android/media/cts/MediaScannerConnectionTest.java
c0b3852b438d0a25a02737ed2c7e61ba3877f893 04-Apr-2016 Robert Shih <robertshih@google.com> Merge "Update ClearKeySystemTest to use MediaExtractor.getDrmInitData" into nyc-dev
a42f2d02a32d210d375a0ef2ff3dde083797bc7b 04-Apr-2016 Jia Zhao <jiaqzhao@google.com> Merge "Add video decode accuracy tests to CTS." into nyc-dev
7ea13a9b2ed6051d4c728d3da24db1cb15efbb16 24-Mar-2016 Julia Reynolds <juliacr@google.com> Fix failures related to DND access changes.

Bug: 27814247
Bug: 27813426
Change-Id: If188689a8f102a4545a95f696ec787ab6dc4a6af
rc/android/media/cts/AudioManagerTest.java
rc/android/media/cts/RingtoneTest.java
d6409cf3c010cd3b1c93b894432613c5265707a7 04-Apr-2016 Sungsoo Lim <sungsoo@google.com> Merge "Update MediaBrowser CTS" into nyc-dev
c9e5f7b364930860a7ea6dcaaf8d6c18ab1f3e06 14-Mar-2016 Sungsoo Lim <sungsoo@google.com> Update MediaBrowser CTS

- The base of EXTRA_PAGE is changed from 1 to 0.
- A test for notifyChildrenChanged is added when there is a subscription
callback with page options.

Bug: 27948393
Change-Id: Ia6f73a2e172856c5abb9cbd80f7e18b2d17c5ade
rc/android/media/cts/MediaBrowserServiceTest.java
rc/android/media/cts/MediaBrowserTest.java
7d7fb8129859b393b85fc0c181dca4c14ab94f3d 04-Apr-2016 Insun Kang <insun@google.com> Merge "ExifInterface: Code clean up" into nyc-dev
e3f2a0847db7627fb062055061bc656d38af9407 02-Apr-2016 Wonsik Kim <wonsik@google.com> Merge "media: add opus & vorbis tests" into nyc-dev
4f2ce2965913658c21b3edc9a513ce73cec824bb 01-Apr-2016 Robert Shih <robertshih@google.com> Update ClearKeySystemTest to use MediaExtractor.getDrmInitData

Bug: 26070802
Change-Id: I03e14daef14972d772e97b734f1ca054774f6b93
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/MediaCodecClearKeyPlayer.java
607f64f1234cbc1e1c09b0cf7f85efa5a5dffbcb 01-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "AudioRecordingConfigurationTest: update callback name" into nyc-dev
59b5a07947dac044408e85c9e16dd9d19726294b 23-Mar-2016 Jia Zhao <jiaqzhao@google.com> Add video decode accuracy tests to CTS.

b/27743271

Change-Id: I8d064830594b417866d9019176539dc7e694554c
ndroidManifest.xml
ssets/360pvp9decodertest.webm
ssets/480ph264decodertest.mp4
es/layout/test_runner_activity.xml
es/raw/h264decodertestgolden.png
es/raw/vp9decodertestgolden.png
rc/android/media/cts/DecodeAccuracyTest.java
rc/android/media/cts/DecodeAccuracyTestActivity.java
rc/android/media/cts/DecodeAccuracyTestBase.java
dd89f2c786340f4c509fc890351a9017dd87529f 01-Apr-2016 Wei Jia <wjia@google.com> Merge "MediaSyncTest: increase ramp up time due to initial latency in AudioTrack." into nyc-dev
a3ea7e5808a0fceb6fcc5dbc7cf3ed02c5078f87 01-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> AudioRecordingConfigurationTest: update callback name

Update AudioRecordingCallback.onRecordConfigChanged() to
onRecordingConfigChanged() after API council review

Bug 27952000

Change-Id: Ia443b49acaf0c76cf96f5795a43506b09d89b445
rc/android/media/cts/AudioRecordingConfigurationTest.java
224b704de06c7e84752c39090ac587a45e6da346 31-Mar-2016 Wei Jia <wjia@google.com> MediaSyncTest: increase ramp up time due to initial latency in AudioTrack.

Bug: 26962365
Change-Id: I14bdbcbbab0210720271dcd8c56e98b6973e978c
rc/android/media/cts/MediaSyncTest.java
dae33e58e6f33f6d1d0e0a856529ceb314716bd1 01-Apr-2016 Wonsik Kim <wonsik@google.com> media: add opus & vorbis tests

Bug: 27932496
Change-Id: I81ce016f7d8226906bd453718e62a9a62413aa43
es/raw/sinesweepopus.mkv
es/raw/sinesweepvorbis.mkv
rc/android/media/cts/DecoderTest.java
dc53d88015961a3326a73a73e8b55dcd4939f06f 01-Apr-2016 Insun Kang <insun@google.com> ExifInterface: Code clean up

Replace deprecated constants with newly added ones.

Bug: 27932489
Change-Id: I6ba42214510255dfebb86fe6aeeb2c72a806a2ca
rc/android/media/cts/ExifInterfaceTest.java
91c56b401ac160b711b137cbf884994dc4dd0c7d 31-Mar-2016 Phil Burk <philburk@google.com> Merge "CTS for IEC61937, AC3" into nyc-dev
3b80f663fc12a75c2d6f4ee8d88ce615d406abd3 24-Mar-2016 Phil Burk <philburk@google.com> CTS for IEC61937, AC3

Play surround formats and measure sample rate.

Bug: 27840527
Bug: 27222935
Change-Id: I605237e549abad154e12c4d692784cb8175a2abe
Signed-off-by: Phil Burk <philburk@google.com>
es/raw/voice12_48k_128kbps_15s_ac3.raw
es/raw/voice12_48k_128kbps_15s_ac3_readme.txt
rc/android/media/cts/AudioTrackSurroundTest.java
910456605fa391cb39e311784fc23bb067eb5348 30-Mar-2016 Andy Hung <hunga@google.com> Merge "Alternate way to obtain minimum buffer size for AudioTrack" into nyc-dev
4895e144474e6d22e2801d5dcc6017eecd0aae16 25-Mar-2016 Andy Hung <hunga@google.com> Alternate way to obtain minimum buffer size for AudioTrack

Bug: 27817933
Change-Id: I31ef87afeb49084416bbf173daa30f1254d1791e
rc/android/media/cts/AudioTrackTest.java
15b8cacd08113d43814ff635cbc6b9b6e4e272d9 28-Mar-2016 Jeff Tinker <jtinker@google.com> Merge "Add cts test for CryptoInfo.Pattern" into nyc-dev
4729146a18b0ae850722ef60d5858cb9ebdb3508 28-Mar-2016 Jeff Tinker <jtinker@google.com> Add cts test for CryptoInfo.Pattern

bug: 27874032
Change-Id: I96a7ac4c812e55b6c58f66d453ef9b0dd485eb2c
rc/android/media/cts/MediaCodecTest.java
ac6ae5f610e3de85e572a8c22eb14aae49d923b3 25-Mar-2016 rago <rago@google.com> Using longer wavefile for Visualizer based Test

Short wavefiles (less than 1.5 seconds) might not work well with Visualizer.
This longer wavefile (5 seconds) gives more reliable results.

Bug: 27292158
Change-Id: I30b4beb2461fe74705d204223e464051197aa0bf
es/raw/sine1khzm40db.wav
rc/android/media/cts/LoudnessEnhancerTest.java
3486b6837a7b74a31f9e4d967e1609f155856024 25-Mar-2016 Paul Mclean <pmclean@google.com> Merge "Fix 32-bit / 64-bit CTS problems in AcquireJavaRoutingProxy() tests." into nyc-dev
ffe1320fd5f9a59b443b5549988b445c1885ab9f 25-Mar-2016 Paul McLean <pmclean@google.com> Fix 32-bit / 64-bit CTS problems in AcquireJavaRoutingProxy() tests.

Bug: 27787215
Change-Id: Iaf59fd96608b12b4a833d4cfd20f4f0c50dd0c2f
ibndkaudio/AudioPlayer.cpp
ibndkaudio/com_android_ndkaudio_AudioPlayer.cpp
ibndkaudio/com_android_ndkaudio_AudioPlayer.h
ibndkaudio/com_android_ndkaudio_AudioRecorder.cpp
ibndkaudio/com_android_ndkaudio_AudioRecorder.h
4389d50eda635533b3478ab58d782376eb8a046d 25-Mar-2016 Insun Kang <insun@google.com> Merge "Add missing CTS for ExifInterface constructors" into nyc-dev
6fe236d475d1c81b28c05e5ae4fcb1c7de158980 23-Mar-2016 Insun Kang <insun@google.com> Add missing CTS for ExifInterface constructors

Also modified the previous code to increase CTS coverage for these APIs.
- setAttribute()
- saveAttributes()
- getAttributeInt()
- getAttributeDouble()

Bug: 27631370
Change-Id: I5daeae435c832b6e85d42d80d33faf366f1c53ce
ssets/image_exif_byte_order_ii.jpg
ssets/image_exif_byte_order_mm.jpg
ssets/lg_g4_iso_800.dng
es/values/exifinterface.xml
rc/android/media/cts/ExifInterfaceTest.java
8ead4292aac1031ea5c2080e8960846e7bffa14a 23-Mar-2016 Edwin Wong <edwinwong@google.com> Merge "Add Wifi status to help diagnose testClearKeyPlaybackCenc failures." into nyc-dev
139981769bc6cc7f2a28dc507c823ace796cf0e7 12-Mar-2016 Edwin Wong <edwinwong@google.com> Add Wifi status to help diagnose testClearKeyPlaybackCenc failures.

Add IConnectionStatus interface to report and test Wifi connection.
Implemented WifiStatus for Wifi connection status. Also perform a
ping test to the video content server to see if the server is up.

bug: 26917432
connection and display some Wifi status.

Change-Id: I70bed8e5b2b873ac4ff66d6915a887ce9b3dc7b6
ndroidManifest.xml
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/IConnectionStatus.java
rc/android/media/cts/WifiStatus.java
37daeae44a9098c8fd023a717e11653e09f2749f 22-Mar-2016 Glenn Kasten <gkasten@google.com> Merge "Fix sensitivity of sample rate timestamp test to short test runs" into nyc-dev
0e3510460ca62fa2fa0dfa9a432b5c10990c4c9c 22-Mar-2016 Glenn Kasten <gkasten@google.com> Fix sensitivity of sample rate timestamp test to short test runs

Bug: 27644480
Change-Id: Idf0895cce0e377aeadee9ade380aa21ee62ca732
rc/android/media/cts/AudioRecordTest.java
cfc6dd9a52ee1774e23fbe3dfed01e99c9250bd1 22-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "Add a cts test to test Video Encoder's intra refresh feature." into nyc-dev
c99cd4787ada8409c093ff065964a8e340a1297e 22-Mar-2016 Insun Kang <insun@google.com> Merge "MediaRouter: Add initial CTS tests for MediaRouter" into nyc-dev
1abd4f31c633b44c404edbbc87041a97e936c9a8 18-Mar-2016 Insun Kang <insun@google.com> MediaRouter: Add initial CTS tests for MediaRouter

Bug: 27631369, Bug: 21448861
Change-Id: I722f0c1178afd9ef4b9f8f75d312102de90fd4fa
rc/android/media/cts/MediaRouterTest.java
abbb0b7454879c0538564c21801ca74fdb47023e 21-Mar-2016 Glenn Kasten <gkasten@google.com> Merge "Make build warnings be errors" into nyc-dev
e8f78899fa0dc2606f746bf73b4465643876d638 07-Mar-2016 Hangyu Kuang <hkuang@google.com> Add a cts test to test Video Encoder's intra refresh feature.

Also add the feature to save all the encoded video from the encoders if enable
the flag.

Bug:27505053
Change-Id: Iabb084cd5817769e66d8022a137bca1297a905d2
rc/android/media/cts/VideoEncoderTest.java
c5dbd0de50fb37273032d7992816cc11a2d64c85 21-Mar-2016 Ricardo Garcia <rago@google.com> Merge "Using longer wavefile for Visualizer Test" into nyc-dev
b3f84519e90affc0d1b386cdd62c2c7aec844ae0 19-Mar-2016 rago <rago@google.com> Using longer wavefile for Visualizer Test

Short wavefiles might return inaccurate position information.
This 5 second wavefile will correctly be detected as playing and the
tests will run smoothly.

bug: 26911756
Change-Id: I3dd1e2205596a7451874ea5322c30abb40ac31e3
es/raw/sine1khzm40db.wav
5d6503c58cc5eda7a766fa30c9994a53313b0d29 21-Mar-2016 Glenn Kasten <gkasten@google.com> Fix build warnings

Change-Id: I09e36461337776931fd11c0b7093684605429227
ibndkaudio/AudioPlayer.cpp
ibndkaudio/AudioRecorder.cpp
ibndkaudio/AudioSource.cpp
ibndkaudio/WaveTableGenerator.cpp
ibndkaudio/WaveTableOscillator.cpp
ae46fcafcdee9abfab60d4e71741faf5265df3bf 21-Mar-2016 Glenn Kasten <gkasten@google.com> Merge "Fix CRLF line endings" into nyc-dev
2dbf4257dc10cba23fefda7b4c0f627b1eeed68b 18-Mar-2016 Glenn Kasten <gkasten@google.com> Fix build warnings

Change-Id: I82c5339de33ee55f9760ef8212963b869d8f29cb
ibaudiojni/appendix-b-1-2-recording.cpp
ibaudiojni/audio-record-native.cpp
ibaudiojni/audio-track-native.cpp
ibmediandkjni/native-media-jni.cpp
19a69aed07978b57455f5367f8b7555af52bbe57 18-Mar-2016 Glenn Kasten <gkasten@google.com> Make build warnings be errors

Change-Id: I83d9faf856287fa607d207dc4c12b26d0ef391b4
ibaudiojni/Android.mk
ibmediandkjni/Android.mk
ibndkaudio/Android.mk
37804d0e3002f8a0c167c103cd4b2d4ec62a2617 18-Mar-2016 Glenn Kasten <gkasten@google.com> Fix CRLF line endings

Change-Id: Ib04496280a8f5a673a38159a490a7ecbc1d1f36f
ibndkaudio/AudioPlayer.cpp
ibndkaudio/AudioPlayer.h
ibndkaudio/AudioSource.cpp
ibndkaudio/AudioSource.h
ibndkaudio/PeriodicAudioSource.cpp
ibndkaudio/PeriodicAudioSource.h
ibndkaudio/SystemParams.cpp
ibndkaudio/SystemParams.h
ibndkaudio/WaveTableGenerator.cpp
ibndkaudio/WaveTableGenerator.h
ibndkaudio/WaveTableOscillator.cpp
ibndkaudio/WaveTableOscillator.h
4426573cdac78d9510f3644a5c40f7d4088cf0f1 18-Mar-2016 Phil Burk <philburk@google.com> Merge "CTS: AudioTrack play() after setBufferSizeInFrames()" into nyc-dev
2a5429b5eee6253b677ef2960b9d3e1a2951a1e7 05-Mar-2016 Phil Burk <philburk@google.com> CTS: AudioTrack play() after setBufferSizeInFrames()

Bug: 27505889
Change-Id: I9e9f293ba46a9eed1039352afa721ab795c8eac1
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/AudioTrackLatencyTest.java
2e42632d69404ef3b1cc160a717f1a6ce1bce504 17-Mar-2016 Paul Mclean <pmclean@google.com> Merge "CTS Tests for Native Routing." into nyc-dev
e7e7b93cd1e4cb10441a43e3bf2977a3eced7f49 16-Mar-2016 Paul McLean <pmclean@google.com> CTS Tests for Native Routing.

Bug: 27702429

Change-Id: I2900b38da53156336121bc9fe6eb4682ecab5f85
ndroid.mk
ibndkaudio/Android.mk
ibndkaudio/AndroidManifest.xml
ibndkaudio/AudioPlayer.cpp
ibndkaudio/AudioPlayer.h
ibndkaudio/AudioRecorder.cpp
ibndkaudio/AudioRecorder.h
ibndkaudio/AudioSink.h
ibndkaudio/AudioSource.cpp
ibndkaudio/AudioSource.h
ibndkaudio/OpenSLESUtils.cpp
ibndkaudio/OpenSLESUtils.h
ibndkaudio/PeriodicAudioSource.cpp
ibndkaudio/PeriodicAudioSource.h
ibndkaudio/SystemParams.cpp
ibndkaudio/SystemParams.h
ibndkaudio/WaveTableGenerator.cpp
ibndkaudio/WaveTableGenerator.h
ibndkaudio/WaveTableOscillator.cpp
ibndkaudio/WaveTableOscillator.h
ibndkaudio/com_android_ndkaudio_AudioPlayer.cpp
ibndkaudio/com_android_ndkaudio_AudioPlayer.h
ibndkaudio/com_android_ndkaudio_AudioRecorder.cpp
ibndkaudio/com_android_ndkaudio_AudioRecorder.h
ibndkaudio/src/com/android/ndkaudio/AudioPlayer.java
ibndkaudio/src/com/android/ndkaudio/AudioRecorder.java
rc/android/media/cts/AudioPlayRoutingNative.java
rc/android/media/cts/AudioRecordRoutingNative.java
2330f4564c94283c21eaf5461baa987cc68556c8 17-Mar-2016 Julia Reynolds <juliacr@google.com> adjustStreamVolume can be called without DND policy access.

Bug: 27711587
Change-Id: Ib8eac232e09a7c7829107c11b7e3590aafa46067
rc/android/media/cts/AudioManagerTest.java
204c5d8b265fe52bd714697bfd3fc4a83bf85333 11-Mar-2016 Julia Reynolds <juliacr@google.com> AudioManager tests for DND access change.

AudoManager calls that would trigger DND mode changes are not
allowed from apps without Notification Policy Access.

Change-Id: Ieace5efccc44351b0f9df93df874edac227d080a
rc/android/media/cts/AudioManagerTest.java
rc/android/media/cts/Utils.java
864021c3f57fb02f440d45cb70edfa2ed2c8e203 11-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "android.media.AudioRecordingConfiguration test update" into nyc-dev
b3d0ab6c5fcc3d6a5c48fb0e2c8ea700aca066d4 11-Mar-2016 Andy Hung <hunga@google.com> Merge "AudioTrackTest: test FastTrack timestamps" into nyc-dev
9650fed121addb36a16d10651cc1584fa08f8274 11-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> android.media.AudioRecordingConfiguration test update

Make sure AudioManager.AudioRecordingCallback.onRecordConfigChanged() is
called so it appears in the test coverage (this callback meant to be
overriden is already tested).

Change-Id: Iaa74bd676585ea4e56b878c9c53b9da7f6a3c396
rc/android/media/cts/AudioRecordingConfigurationTest.java
c74dd7674d8badbe2cd9a2924a9eaebe2c322fbf 18-Feb-2016 Andy Hung <hunga@google.com> AudioTrackTest: test FastTrack timestamps

Bug: 26413951
Change-Id: Ib5b1f2a7eb180ea0f39c006565c33259729e5ec5
rc/android/media/cts/AudioTrackTest.java
618c2c18aedb2b2c08593d3579c7120ae39f32da 11-Mar-2016 Hangyu Kuang <hkuang@google.com> Merge "Add image MD5 checksum native implenmentation." into nyc-dev
28ab6f9c4b496aabe98e465aaf653b64ad5976bd 08-Mar-2016 Hangyu Kuang <hkuang@google.com> Add image MD5 checksum native implenmentation.

Bug:27484784
Change-Id: I2a4594dbeefacb6c2ee1c3900b856177cda3fe0b
ibmediandkjni/Android.mk
ibmediandkjni/codec-utils-jni.cpp
ibmediandkjni/md5_utils.cpp
ibmediandkjni/md5_utils.h
rc/android/media/cts/CodecUtils.java
cae2358925c14f36e927788f3d56aca99df46345 09-Mar-2016 Sungsoo Lim <sungsoo@google.com> MediaBrowser: Test for subscribing invalid item with options

Bug: 26919177
Change-Id: I4b3d3cd32d4e8afd6ba5a201d9c0d841e3817bc9
rc/android/media/cts/MediaBrowserTest.java
72ae99c55239f37eb649b13a448efdabc47cc3f2 09-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "android.media marshalling tests" into nyc-dev
3d929a1f48eae9ebe2a3511104d26f1884de92c4 05-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> android.media marshalling tests

Add marshall/unmarshall tests for AudioFormat,
and AudioRecordingConfig.
AudioAttributes: verify describeContents.

Change-Id: Ie851e787ee957b168685ae55b28ec5d6f4e260e5
rc/android/media/cts/AudioAttributesTest.java
rc/android/media/cts/AudioFormatTest.java
rc/android/media/cts/AudioRecordingConfigurationTest.java
d396cbde09ec83689d5cfd83fc5ccf2ef753f948 08-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Cts test changes for AudioRecordingConfiguration API changes" into nyc-dev
a9f74163a82cff82712aa99d0bba656da90350ac 08-Mar-2016 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaBrowser Pagination API" into nyc-dev
c264313c6594455bc9e670390acdabe500bf22a1 07-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Cts test changes for AudioRecordingConfiguration API changes

Change-Id: I0d2afe23cbaee854a723c5796e9b03fe943ddd08
rc/android/media/cts/AudioRecordNotificationTest.java
rc/android/media/cts/AudioRecordingConfigurationTest.java
4f6fce79485d36c0209e30713beea16736ca761e 07-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Revert "Update AudioRecordNotification test after API change"" into nyc-dev
e7ef8ce96518d3931a935f527e59c6ea12104fa8 07-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Revert "Update AudioRecordNotification test after API change"

This reverts commit 5ac241b57a80d1965ce975c1015113f4eb0fed36.

Change-Id: I5ebf8848d55b565f841664e047119144caad3187
rc/android/media/cts/AudioRecordNotificationTest.java
a38b7555da5716aaa58c80f14131f151a000c79a 07-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update AudioRecordNotification test after API change" into nyc-dev
a600a0ec71f2243786795e7860360dd8c205dbe0 05-Mar-2016 Hangyu Kuang <hkuang@google.com> Move the YUVImage class to a seperate file so android.media.cts.* could use it.

Bug:27505053
Change-Id: I6f4630fd95865ad8633788ab020825a9d7cf9ef3
ndroid.mk
rc/android/media/cts/YUVImage.java
5a01b6c8bc3167159f9f347c0ecef4b97966ef25 04-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update AudioRecordNotification test after API change" into nyc-dev
4f479aa92546b41a6bf23de2b946d6ede217d3f7 04-Mar-2016 Ian Ni-Lewis <ilewis@google.com> Merge "Added tests for native channel masks. Bug: 23899736" into nyc-dev
76eb322cb17d628786834476e9dbf1279ff330bd 04-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "Revert "Revert "media: skip unsupported test clip in adaptive playback test""" into marshmallow-cts-dev am: cd4327962a am: aa7a96bc4b am: c521c624e5 am: e4dcd2b432
am: f3019daee1

* commit 'f3019daee156c829e13727de76994a44430578d8':
Revert "Revert "media: skip unsupported test clip in adaptive playback test""
d82826d4103f7a0e31a194ddc6302e3811b0ff7f 08-Feb-2016 ilewis <inl@google.com> Added tests for native channel masks.
Bug: 23899736

Change-Id: I95be017d65630f6a5645b10df2034fc1bebe8bb6
ibaudiojni/audio-record-native.cpp
ibaudiojni/audio-track-native.cpp
rc/android/media/cts/AudioNativeTest.java
rc/android/media/cts/AudioRecordNative.java
rc/android/media/cts/AudioTrackNative.java
3b2c6ffd64d0a99a0a3cbd18f44cb7176b19ba90 29-Feb-2016 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaBrowser Pagination API

Bug: 26919177
Change-Id: Idf8a2fb2deeb1af56e5c1eb0e290837546c35c3d
rc/android/media/cts/MediaBrowserTest.java
5ac241b57a80d1965ce975c1015113f4eb0fed36 03-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Update AudioRecordNotification test after API change

Bug 27385560

Change-Id: I5fc70c9745f745391090065bade07854794a62bb
rc/android/media/cts/AudioRecordNotificationTest.java
2eef2200cd1456cd3277df9ff08c141e0a3f92ef 02-Mar-2016 Daniel Xie <dxie@google.com> Merge "Revert "media: skip unsupported test clip in adaptive playback test"" into marshmallow-cts-dev am: 1c077ee623 am: 534984c45e am: 6b846877e5 am: 6953cdf09e
am: 16ec0a87b9

* commit '16ec0a87b914c78fdd87bb4ef0fae05bddedac42':
Revert "media: skip unsupported test clip in adaptive playback test"
5b91cb3308f5b6e1bfdeb26c637e93cd74bcaede 02-Mar-2016 Jean-Michel Trivi <jmtrivi@google.com> Update AudioRecordNotification test after API change

Bug 27385560

Change-Id: If4b7d90e5f1cb4785e825d0131bad243332d8947
rc/android/media/cts/AudioRecordNotificationTest.java
ef2d328f34fc08465b12ee81fa1b8471a69253a4 02-Mar-2016 Ronghua Wu <ronghuawu@google.com> Revert "Revert "media: skip unsupported test clip in adaptive playback test""

This reverts commit 7ea817b767842684e1956b1a9eb1320a092e0b40.

Change-Id: Ia1f4f7f11e4e566e678939cde58399a19151d2c0
rc/android/media/cts/AdaptivePlaybackTest.java
dde5f6d06b454dece22cfcc7adfb019d06d4dc63 02-Mar-2016 Chien-Yu Chen <cychen@google.com> Merge "MediaRecorderTest: Check recorded duration" into nyc-dev
f8febd4813fa9ce637ddaa6b6ce7cd9b56e1a142 24-Feb-2016 Sungsoo Lim <sungsoo@google.com> Add CTS for subscribing invalid media item

Bug: 26733259, Bug: 26919177
Change-Id: I3b189115d8d781d496af4f5fd31f351316658116
rc/android/media/cts/MediaBrowserTest.java
rc/android/media/cts/StubMediaBrowserService.java
6b846877e50163caf1415f1695328fc2418dd2af 02-Mar-2016 Daniel Xie <dxie@google.com> Merge "Revert "media: skip unsupported test clip in adaptive playback test"" into marshmallow-cts-dev am: 1c077ee623
am: 534984c45e

* commit '534984c45eebf64737a5dabf9356b4d0d2c00650':
Revert "media: skip unsupported test clip in adaptive playback test"
534984c45eebf64737a5dabf9356b4d0d2c00650 02-Mar-2016 Daniel Xie <dxie@google.com> Merge "Revert "media: skip unsupported test clip in adaptive playback test"" into marshmallow-cts-dev
am: 1c077ee623

* commit '1c077ee623bdb8f6a47bdb23c041ffb9e8afa046':
Revert "media: skip unsupported test clip in adaptive playback test"
7ea817b767842684e1956b1a9eb1320a092e0b40 02-Mar-2016 Daniel Xie <dxie@google.com> Revert "media: skip unsupported test clip in adaptive playback test"

This reverts commit 321f4fd90e61355259920173ac63f023b228d699.

Change-Id: Ia3f7c98a4e79b8d1fe27bf3676d6ce542e2e16f0
rc/android/media/cts/AdaptivePlaybackTest.java
706f1fe970460a153bce20bca158bc2b8dcb8524 02-Mar-2016 Chien-Yu Chen <cychen@google.com> MediaRecorderTest: Check recorded duration

Check the recorded duration is not longer than expected.

Bug: 26525150
Change-Id: I02e5841c5209dd067b77e496999403e6faa946b6
rc/android/media/cts/MediaRecorderTest.java
6cce415ea8411816481ffb61a9ec5f4411905ba0 01-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: skip unsupported test clip in adaptive playback test" into marshmallow-cts-dev am: 6245c46aad am: deeaccc636 am: b27464faf9 am: 1c5e757b56
am: 2cfe59822a

* commit '2cfe59822a194b75f18ce916523ef0c3e79da3b3':
media: skip unsupported test clip in adaptive playback test
b27464faf9bbff4b51b7de0c41e7cd8506896e39 01-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: skip unsupported test clip in adaptive playback test" into marshmallow-cts-dev am: 6245c46aad
am: deeaccc636

* commit 'deeaccc63684223e9de3122aa52e7ff2aa6d6d9a':
media: skip unsupported test clip in adaptive playback test
deeaccc63684223e9de3122aa52e7ff2aa6d6d9a 01-Mar-2016 Ronghua Wu <ronghuawu@google.com> Merge "media: skip unsupported test clip in adaptive playback test" into marshmallow-cts-dev
am: 6245c46aad

* commit '6245c46aadc183e9ed45a08529d43ad43aa4c071':
media: skip unsupported test clip in adaptive playback test
2ff78ae2b2ff65060c39cc849d68f56463e434dd 19-Feb-2016 Stuart Scott <stuartscott@google.com> Switch to CTSv2

bug:21762834
Change-Id: Ie51a0ed4560b46c2f360e14980e5fab7fe6479fe
ndroid.mk
d3a8aecc824820b076c4df7504eb85b019e6d865 26-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Audio record notification: test audio device info" into nyc-dev
520520585540ba9dfd4fd9c4aedd3baf3bec2f3f 26-Feb-2016 Donghyun Cho <donghyun@google.com> Merge "Add CTS for prepare-related APIs in MediaSession/MediaController" into nyc-dev
28748fab5186855de32f3213fd3726a290663311 26-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Audio record notification: test audio device info

Test that the audio device in the recording configurations matches
the one used by the AudioRecord in the test.

Bug 22876530

Change-Id: Ie11209696315eb846a72ffc70d83bf17d7840203
rc/android/media/cts/AudioRecordNotificationTest.java
321f4fd90e61355259920173ac63f023b228d699 24-Feb-2016 Ronghua Wu <ronghuawu@google.com> media: skip unsupported test clip in adaptive playback test

Bug: 27034640
Change-Id: I97f85f73e830d73b06150c2161567e0fcc5c6d13
rc/android/media/cts/AdaptivePlaybackTest.java
12cb9cd5ca9cde659da288d64e72c1191988027b 25-Feb-2016 Jaesung Chung <jaesung@google.com> Fix the test failure of ExifInterfaceTest

Bug: 27309314
Change-Id: Ia639aedebd6ae661562f77bce34c00a6cca07326
es/values/exifinterface.xml
rc/android/media/cts/ExifInterfaceTest.java
2a84004243eb17f2b241b3c50ec7f8441fc3a79d 25-Feb-2016 Donghyun Cho <donghyun@google.com> Add CTS for prepare-related APIs in MediaSession/MediaController

Bug: 27350514
Change-Id: Ib0013ef200be77f667878c7194971361f2237cfd
rc/android/media/cts/MediaControllerTest.java
445a1281533938653c5c767bedcdba69e79f53c0 24-Feb-2016 Rachad Alao <rachad@google.com> Merge "Fix cleanup issue in android.media.cts.DecoderTest.testTunneledVideoPlayback" into nyc-dev
e331e4796e08b5e987bb51096b1011be39389062 24-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Merge "Audio record notification: test audio format" into nyc-dev
f09a96c482f265efc8b3d1f11f0eee91055e7ab4 23-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Audio record notification: test audio format

Test that the active recording format is found in the
active recording configurations, and that the device
format is valid (what it is exactly is device-specific).

Bug 22876530

Change-Id: I3c691fbb2f66197ccf20e30d36124f60d947ecba
rc/android/media/cts/AudioRecordNotificationTest.java
005740c23ed6e983dfdead1f4c3fc7354d979850 23-Feb-2016 Daniel Xie <dxie@google.com> Merge "VideoDecoderPerfTest: limit test runs if we have many codecs" into marshmallow-cts-dev am: 0ec1519c98 am: 502886ce6c am: 45b3bcd8a1 am: 6b665c7993
am: 91a7455818

* commit '91a7455818aa02ddfdeb9b8ce88c704c14a102b6':
VideoDecoderPerfTest: limit test runs if we have many codecs
45b3bcd8a12b9512473d6845c965e19eb2b457b2 23-Feb-2016 Daniel Xie <dxie@google.com> Merge "VideoDecoderPerfTest: limit test runs if we have many codecs" into marshmallow-cts-dev am: 0ec1519c98
am: 502886ce6c

* commit '502886ce6ce2f600e2ecb1f0cde6a4711c781a10':
VideoDecoderPerfTest: limit test runs if we have many codecs
23a5cfe8b5651f2b7ac7dffe899e520f9ef9ce64 23-Feb-2016 Daniel Xie <dxie@google.com> Merge "Should use getSupportedVideoSizes()" into marshmallow-cts-dev am: 07ba022f2b
am: 55ec150397

* commit '55ec1503978bbe90b6d15a8fce773819f63747f2':
Should use getSupportedVideoSizes()
502886ce6ce2f600e2ecb1f0cde6a4711c781a10 23-Feb-2016 Daniel Xie <dxie@google.com> Merge "VideoDecoderPerfTest: limit test runs if we have many codecs" into marshmallow-cts-dev
am: 0ec1519c98

* commit '0ec1519c9889dabe1faf3aed04b5f67a54980c41':
VideoDecoderPerfTest: limit test runs if we have many codecs
55ec1503978bbe90b6d15a8fce773819f63747f2 23-Feb-2016 Daniel Xie <dxie@google.com> Merge "Should use getSupportedVideoSizes()" into marshmallow-cts-dev
am: 07ba022f2b

* commit '07ba022f2b930323cfd912cadcf71aa3702f6967':
Should use getSupportedVideoSizes()
0ec1519c9889dabe1faf3aed04b5f67a54980c41 23-Feb-2016 Daniel Xie <dxie@google.com> Merge "VideoDecoderPerfTest: limit test runs if we have many codecs" into marshmallow-cts-dev
8e40bf3919fce22f0142d2b334d08085b763b607 23-Feb-2016 Lajos Molnar <lajos@google.com> VideoDecoderPerfTest: limit test runs if we have many codecs

Bug: 26274449
Change-Id: Ie1c051b062b1d7304e71a415dce273ed18796fdf
rc/android/media/cts/VideoDecoderPerfTest.java
7fcfb0de8b19c571eec4e706301e953bb21a7a5c 05-Feb-2016 Rachad <rachad@google.com> Fix cleanup issue in android.media.cts.DecoderTest.testTunneledVideoPlayback

b/26771316

Change-Id: I0282c0464ae60a1c8b587cf6cd88275eb42aa14f
rc/android/media/cts/DecoderTest.java
dc7d94929e909289731a833df59e39a5d5daab1f 18-Feb-2016 Hangyu Kuang <hkuang@google.com> Feed monotonic increasing timestamp to mediamuxer to make it happy.

Otherwise, MediaMuxer will hang.

Bug: 26928205
Change-Id: I7fffd4c8be069b365ae85bb337f813dcce5ab617
(cherry picked from commit b2b0665bf45fd8ef969ed9ecccb8a0f834ad8b63)
rc/android/media/cts/EncoderTest.java
d1f30c0fa73e0918ec7040072a91f34fb9cd0777 05-Feb-2016 Jaesung Chung <jaesung@google.com> Add CTS for closed captions

Bug: 26971555
Change-Id: I0eb75445884c4ebd9c41ce5e8f194299f912243e
es/raw/testvideo_with_2_subtitle_tracks.mp4
es/raw/testvideo_with_2_subtitles.3gp
es/raw/testvideo_with_2_timedtext_tracks.3gp
rc/android/media/cts/MediaPlayerTest.java
cc0a04e2fbf769abb2c2f685e7ab6ef2006a2e84 17-Feb-2016 Jean-Michel Trivi <jmtrivi@google.com> Add test for audio recording notifications

Add tests for AudioManager.getActiveRecordConfigurations()
and AudioManager.AudioRecordingCallback

Bug 22876530

Change-Id: Ieac91d7f38c53b2c646e870b68f25a102a87370f
rc/android/media/cts/AudioRecordNotificationTest.java
2520f1571ee277aadca3b728597a7bb4f2edc0f7 16-Feb-2016 Daniel Xie <dxie@google.com> Merge "DO NOT MERGE: Improved LoudnessEnhancer audio effect tests" into lollipop-mr1-cts-dev
3da254a21a56e552849534a067feb3fd2ef48f8f 12-Feb-2016 Phil Burk <philburk@google.com> Merge "CTS: Test low latency AudioTrack features." into nyc-dev
023e659ebbc1831f1ecbdc9cdd690d9ac06d6795 11-Feb-2016 Andy Hung <hunga@google.com> Check that AudioTimestamp eventually reaches last frame

Bug: 11085154
Bug: 17552775
Change-Id: Ie70cdf783cc83d3312516d497ee59e2f2ef65164
rc/android/media/cts/AudioTrackTest.java
c00d27757de50834732e72e3fae2504c1e335a58 03-Feb-2016 Phil Burk <philburk@google.com> CTS: Test low latency AudioTrack features.

Tests setBufferSizeInFrames(), getBufferCapacityInFrames(),
getUnderrunCount(), and AudioAttributes.FLAG_LOW_LATENCY.

Bug: 21019153
Change-Id: I1d718f82aa7cc93b8b207cb782a060bba1dbd801
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioTrackLatencyTest.java
a0c4e72a4bb577830e8982adb7062d50c7e3164f 05-Feb-2016 Andy Hung <hunga@google.com> Verify AudioRecord timestamps

Bug: 13569372
Bug: 22886739

Change-Id: Ie436052f9a23dc60dde8334b68870a5098d07a1d
rc/android/media/cts/AudioRecordTest.java
e0068f6f23108cde7882c5edc7f2ae087dc86488 08-Feb-2016 rago <rago@google.com> Fix for MediaPlayer not ready bug in LoudnessEnhancerTest

Number of tries and wait-time changed. Using long test file.

bug: 26910304
Change-Id: Ic7274d9b74f974889c3a5438ca0d134d9f90cf02
rc/android/media/cts/LoudnessEnhancerTest.java
563ae99d67c0b55d44c484394c54891e1771afd5 03-Feb-2016 Wonsik Kim <wonsik@google.com> Merge "media: test MediaCodecList.find(En|De)coderForFormat() with AAC profiles"
830ed7f1719a149c100e2b05bee132527b4d4b07 25-Sep-2015 Masanori OGINO <ogino.masanori@sharp.co.jp> Should use getSupportedVideoSizes()

The both parameters width and height are used for
MediaRecorder#setVideoSize(). A resolution which is returned from
getSupportedPreviewSizes() may not be encoded by MediaRecorder.
That method returns resolutions which are supported at still camera
mode also. Therefor the first item of the resolutions is not always
supported by a video encoder. So getSupportedVideoSizes() must be
used for recording video instead of getSupportedPreviewSizes().

Change-Id: I8399e16c0a0d633850a05699fc1ba741ee0cd904
(cherry picked from commit bfa14ee40c34e5a1d52222e7440ee00a73bdcecf)
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaRecorderTest.java
51d85f61208db805068da20c5154b2f0036139ac 02-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Fix EncoderTest file writing"
8eee0b54dce33fc3e59beb7d884b9b71f1b4e653 02-Feb-2016 Marco Nelissen <marcone@google.com> Fix EncoderTest file writing

For formats that require CSD, we can't create the track until we have
the encoder's output format.
Also fix thread pool shutdown.

Change-Id: Ia7edb9a214f130f76403636d9e3832dadc4fdff2
rc/android/media/cts/EncoderTest.java
1f40562e33566c34cb4b00fa6252c4596fe1dc94 01-Feb-2016 Marco Nelissen <marcone@google.com> Merge "Expand and improve encoder tests"
ced18aaf29d3eed7a1ded1b4acf604e94fbeeb34 26-Jan-2016 Marco Nelissen <marcone@google.com> Expand and improve encoder tests

Adds actual PCM audio input to the streams being encoded,
and adds a way to save the resulting encoded files for
debugging purposes.

Change-Id: If434bf2f2e61590b26da4e67b25b4dff16d2a4df
es/raw/okgoogle123_good.wav
rc/android/media/cts/EncoderTest.java
1d3add71d45f0ffb7f75635506a2204e140bb331 01-Feb-2016 Jaesung Chung <jaesung@google.com> Merge "Add ExifInterface tests for JPEG and RAW image files"
b671cd53368a7bbca86c53cddb1b3d073b47cd6a 27-Jan-2016 Jaesung Chung <jaesung@google.com> Add ExifInterface tests for JPEG and RAW image files

Bug: 26678618
Change-Id: Id4ddc62782d9e25be0c8bb8c35fea9930fc89508
es/raw/image_exif_byte_order_ii.jpg
es/raw/image_exif_byte_order_mm.jpg
es/raw/lg_g4_iso_800.dng
es/values/exifinterface.xml
rc/android/media/cts/ExifInterfaceTest.java
6267157b553f7eddbdf7a386a44a58e439fb19ee 22-Jan-2016 Wonsik Kim <wonsik@google.com> media: test MediaCodecList.find(En|De)coderForFormat() with AAC profiles

Bug: 26742857
Change-Id: I8ee9de608c1863743ad5432a2b053e577cb1b283
rc/android/media/cts/MediaCodecListTest.java
997eaa81ac31d36dcf2d7336fff23a311813bc14 28-Jan-2016 Wonsik Kim <wonsik@google.com> Merge "media: add tests for MediaRecorder.pause/resume()"
89f720f9737f1fced7d13462b12608299cb5f6f2 27-Jan-2016 Wonsik Kim <wonsik@google.com> media: add tests for MediaRecorder.pause/resume()

Bug: 20092236
Change-Id: I0beca2448eb63fdd3b775486e46a6ce163537c66
rc/android/media/cts/MediaRecorderTest.java
0f21d01fe7a282a1ccbc4f7a42970a6c9a9d73c3 27-Jan-2016 Wonsik Kim <wonsik@google.com> Merge "media: add HEVC encoder tests"
1f700ccb4ce83c46ca573c10d8125d739a52ea4c 25-Jan-2016 Aaron Holden <aaronholden@google.com> Merge "Modify dynamic config xml and storage structures"
3b86bfabaf83e9757e9680826ccdba009721b6c1 19-Jan-2016 Wonsik Kim <wonsik@google.com> media: add HEVC encoder tests

Bug: 22879917
Change-Id: If4c41aa0bb8c59c51600167ffc77c25e2aa5be81
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
f3cd8c8a306dc1b67ca218353b5150a982e6c4d8 22-Jan-2016 Aaron Holden <aaronholden@google.com> Modify dynamic config xml and storage structures

bug:23625592
Change-Id: I5f950d823772df55fcfddcd2352838d60d832d6c
ynamicConfig.xml
1d3da7abdbcc58c47342cb09ca07a42560c94c68 22-Jan-2016 Robert Shih <robertshih@google.com> Merge "testClearKeyPlayback: add Webm test"
1967b4df7d5a2576ca2de59199dd09ef2ad9d5ce 20-Jan-2016 Hangyu Kuang <hkuang@google.com> media: Remove unnecessary libutils in jni.

Bug:26639573
Change-Id: I1ec8141b91557de8f9d8617c8d182a07c0b80d4c
ibaudiojni/Android.mk
3bed2b99556f894f352d26deb178098d0150ead9 18-Jan-2016 Ricardo Garcia <rago@google.com> Merge "Adding UNPROCESSED to the available audio_sources"
86df641ad36b8a57cc2c49db7d7df2606273261e 02-Dec-2015 rago <rago@google.com> Adding UNPROCESSED to the available audio_sources

bug: 25564291
Change-Id: Ibec737c2c5c372bbd5da04c130004589b9ffcbc7
rc/android/media/cts/MediaRecorderTest.java
2454f8bc9ba86a01aeb0605512c9b27f5cd6a541 15-Jan-2016 Brian Carlstrom <bdc@google.com> resolve merge conflicts of 956d98acb5 to master.

Change-Id: I8e4cc92dc16f6e81324f1f054207d03afeae8d3a
956d98acb5dd0a8874acd6582dec7c144da72e5f 15-Jan-2016 Brian Carlstrom <bdc@google.com> Merge "Fix media CTS to build with NDK" am: 12ee7195af
am: e8d2703195

* commit 'e8d27031956f3514dadd27ecec5fd747a62774ba':
Fix media CTS to build with NDK
9e05e597d216aa425f4af0d7e71e078a85b47e26 14-Jan-2016 Brian Carlstrom <bdc@google.com> Fix media CTS to build with NDK

- Move libctsmediacodec_jni to use libnativehelper_compat_libc++
- Fixed to use NDK header paths

Bug: 26518439
Change-Id: Id9328b997a480a486b4e152292d13899e519e77b
ndroid.mk
ibmediandkjni/Android.mk
ibmediandkjni/native-media-jni.cpp
b2f09bc5607dca02ae45e3bb02a60ee87b0f49dc 13-Jan-2016 Lajos Molnar <lajos@google.com> media: do not use libnativehelper in jni

Bug: 26513168
Change-Id: I070bf92eae60683db712606fe5c55f915e1219cc
ndroid.mk
ibaudiojni/Android.mk
ibmediandkjni/Android.mk
a7e44855a33c6518d5fca3b0929adeb9da1e6a22 09-Jan-2016 Daniel Xie <dxie@google.com> Merge "Fixs bugs regarding CTS fails for low performance codec" into lollipop-mr1-cts-dev
be4f4ea90d69504d12f0e2201a58f1f859adebe9 08-Jan-2016 Aaron Holden <aaronholden@google.com> Revive media test coverage for M

Temporarily remove dynamic configuration components of the media test
package that require a device to run N

bug:23625592
Change-Id: I8446de902ad360c995507bef7e083e1b679470ec
ndroid.mk
ndroidTest.xml
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
6a6aa4ea814dc1806aab7ae3dfae25e9a1850367 06-Jan-2016 Robert Shih <robertshih@google.com> testClearKeyPlayback: add Webm test

Change-Id: Ibe4e4790226bff70ed2cac1a87d9bc925a977cc0
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_44100hz_crypt.webm
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/MediaCodecCencPlayer.java
rc/android/media/cts/MediaCodecClearKeyPlayer.java
1bae90aea47adcdc65ccbb37cf3e8d7e8d09c7d8 07-Jan-2016 js_ou <js_ou@htc.com> EncodeVirtualDisplayWithCompositionTest: Add codec name API.

Symptom: HW codec can not support 1080p AVC encoder.
Root Cause: HW can not support 1080p.
Solution: Add get codec name API to avoid create unfit codec.

Change-Id: If91a83f8219aa413e72ba322fe3d59106b47c018
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
a8959181498e2e83197b75c57e392f3ef5a45ab8 05-Jan-2016 Keun-young Park <keunyoung@google.com> DO NOT MERGE relax the iframe interval to 60

- some devices do not support longer interval in L.
- This is only for L and L MR1. M and later must suppport longer interval.

bug: 22983501
Change-Id: I1f31d40eb2d5df13ec1772747638a17a9c0c2ff5
rc/android/media/cts/EncodeVirtualDisplayTest.java
3520a1da6e1fdff61da892862cdba87775786842 22-Oct-2015 eunim.ko <eunim.ko@lge.com> Fixs bugs regarding CTS fails for low performance codec

If codec returns error while configuring codec, MediaCodec will set state to UNINITIALIZED.
And MediaCodec.stop() throws IllegalStateException if in the Uninitialized state.
ReconfigDrcTest of AdaptivePlaybackTest calls MediaCodec.stop() after configureAndStart().
So if codec doesn't support 720P resolution, codec will return error while configuring and set state to UNINITIALLIZED.
It makes IllegalStateException while stopping codec.
So, I fixed ReconfigDrcTest to call mDecoder.stop() when configureAndStart() returns true.

Change-Id: I47a49d0347258daab913539f79cbe79ca6e2d477
Signed-off-by: Eunim Ko <eunim.ko@lge.com>
rc/android/media/cts/AdaptivePlaybackTest.java
4b3ed94efbc862da26eb24fe6d2ef741efd1f06b 21-Dec-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: fix a test stream filename."
f042961722904f40be676c70d7037c659dc324f9 19-Dec-2015 Ronghua Wu <ronghuawu@google.com> media: fix a test stream filename.

Change-Id: If65fb2ca39a6b63fd0d21849e246f348acd50387
es/raw/video_640x360_mp4_hevc_1638kbps_30fps_aac_stereo_128kbps_44100hz
es/raw/video_720x480_mp4_hevc_1638kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
ce21be8b73950282bcfb3b2b6d5d689acb3c34a5 15-Dec-2015 Marco Nelissen <marcone@google.com> Improve audio encoder tests

Encode more data per run.
Encode semi-random data instead of only silence.
Decrease timeouts and run up to 3 encodes in parallel to speed up the test.

Bug: 25843966
Change-Id: I76ed39953ac086837b63967449bd4b102fa252bd
rc/android/media/cts/EncoderTest.java
6a9df45994b8a17eef91a5911805a0cd61a67375 11-Dec-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 8886278e00
am: 9ec7400810

* commit '9ec740081041eaf7434ee4f475553b3d910da65b':
Basic test of android.media.RemoteController
fe0750d7789ea265195fdb50155fa5f4e01b38ab 10-Dec-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev
am: 3d9381b5f9

* commit '3d9381b5f96638e447812b312e2fce6b5a7198ca':
Fix bugs regarding CTS fails for VP8 codec with low performance
9ec740081041eaf7434ee4f475553b3d910da65b 08-Dec-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a
am: 8886278e00

* commit '8886278e00a6f9b22e0988af3bdc06d51cdb605f':
Basic test of android.media.RemoteController
8886278e00a6f9b22e0988af3bdc06d51cdb605f 08-Dec-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev
am: e48654cb7a

* commit 'e48654cb7ab0736a02231d003876cdabfc4d5cf8':
Basic test of android.media.RemoteController
0318e2751db94eae68a5368e4942ec86fa191714 05-Dec-2015 Daniel Xie <dxie@google.com> Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev
am: 71c0d24172

* commit '71c0d241722cc55f560443b0b139c655e9619d06':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
455d38cd55eb9bb8949655e8fa549d531f96351a 05-Dec-2015 Wei Jia <wjia@google.com> Merge "Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."" into mnc-dr-dev am: a03b088227 am: 252574a051 am: 16368570eb
am: ecf81c91c0

* commit 'ecf81c91c06087e1605a9568965ffefba7778a2d':
Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."
ecf81c91c06087e1605a9568965ffefba7778a2d 05-Dec-2015 Wei Jia <wjia@google.com> Merge "Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."" into mnc-dr-dev am: a03b088227 am: 252574a051
am: 16368570eb

* commit '16368570ebcc4a17ac8b928a29da514817b88424':
Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."
a03b088227fd1e27a39225f6dcf57605b8342a7a 04-Dec-2015 Wei Jia <wjia@google.com> Merge "Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."" into mnc-dr-dev
e45352b21ae4f7543eefd446a3ad1b1d23a0fe0e 03-Dec-2015 Andy Hung <hunga@google.com> Merge "Reduce CTS audio requirements for low memory devices"
4404b2fa1aea713d969b86737cf3e7b4154fe3fe 02-Dec-2015 Andy Hung <hunga@google.com> Reduce CTS audio requirements for low memory devices

Bug: 25562752
Change-Id: I41c03cd81f97927ccff1cc2c22b2831fee968383
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
b0c1112c5cbcb837943e0b060f2c8a0400b2158a 03-Dec-2015 Wei Jia <wjia@google.com> Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding."

This reverts commit 13c1585464a6ba445180e4d0d7d20aaaa418fcee.

The new test was moved to security/.

Change-Id: Icbdb7ce0c7bf1e784db5de41baf8703fb904ce90
es/raw/id3v2_3_extended_header_overflow_padding.mp3
rc/android/media/cts/MediaMetadataRetrieverTest.java
b25420ff02071dd35356e02401753e35c1858489 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev am: 977b792416 am: 42bb01df12 am: b567243ed6 am: d27633bd4b
am: a803622a94

* commit 'a803622a944dcdfd6891e00b6fafb4794eea620d':
Enable test of events occuring after AudioRecord.stop
4261bb43f2d70ffa4f145920a102f30dc69a0cc4 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev am: 97b1eaec60 am: f4d997fb68 am: 2ff04bc836 am: a95384662d
am: 7c97e458d8

* commit '7c97e458d80c961e9d7ba9fd200804673ad386fe':
Reduce CTS audio requirements for low memory devices
b567243ed6b144388007959178fda818502905e9 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev am: 977b792416
am: 42bb01df12

* commit '42bb01df12e553931bd140a1a36e3910e8e53c0b':
Enable test of events occuring after AudioRecord.stop
2ff04bc836a2dc69049bb56c9eedbdd5a169fe9c 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev am: 97b1eaec60
am: f4d997fb68

* commit 'f4d997fb687c3bece0260d9c6ef7ef14d89aeef1':
Reduce CTS audio requirements for low memory devices
42bb01df12e553931bd140a1a36e3910e8e53c0b 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev
am: 977b792416

* commit '977b792416632ec2aedabf5f298cfc19876bc085':
Enable test of events occuring after AudioRecord.stop
f4d997fb687c3bece0260d9c6ef7ef14d89aeef1 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev
am: 97b1eaec60

* commit '97b1eaec602d9504390ac04240be97210f8defca':
Reduce CTS audio requirements for low memory devices
977b792416632ec2aedabf5f298cfc19876bc085 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Enable test of events occuring after AudioRecord.stop" into marshmallow-cts-dev
97b1eaec602d9504390ac04240be97210f8defca 03-Dec-2015 Daniel Xie <dxie@google.com> Merge "Reduce CTS audio requirements for low memory devices" into marshmallow-cts-dev
404bbc3c9bf9d7797348bea4ff9f94ab0a6ce2e3 02-Dec-2015 Andy Hung <hunga@google.com> Reduce CTS audio requirements for low memory devices

Bug: 25562752
Change-Id: I41c03cd81f97927ccff1cc2c22b2831fee968383
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
208474fdabb0dde3b8d0999720bb9615c4c8b548 02-Dec-2015 Daniel Xie <dxie@google.com> Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04 am: 398724c523 am: eae5a58ffb am: da1e92c938 am: b7eb06cf83
am: 5c5a750856

* commit '5c5a75085675077e107de0a0f4091b988f273314':
Do not test AudioPlayback if system doesn't have audio out
5c5a75085675077e107de0a0f4091b988f273314 02-Dec-2015 Daniel Xie <dxie@google.com> Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04 am: 398724c523 am: eae5a58ffb am: da1e92c938
am: b7eb06cf83

* commit 'b7eb06cf833d1576a7438d46ef3025899063aefd':
Do not test AudioPlayback if system doesn't have audio out
eae5a58ffb7ff2687da468c6757967c24e98e97a 02-Dec-2015 Daniel Xie <dxie@google.com> Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev am: 90d0d52c04
am: 398724c523

* commit '398724c52395a39a8cbabc6a7cc2b842db064bba':
Do not test AudioPlayback if system doesn't have audio out
398724c52395a39a8cbabc6a7cc2b842db064bba 02-Dec-2015 Daniel Xie <dxie@google.com> Merge "Do not test AudioPlayback if system doesn\'t have audio out" into marshmallow-cts-dev
am: 90d0d52c04

* commit '90d0d52c04bc6c6c6812502559c75577b5e315ec':
Do not test AudioPlayback if system doesn't have audio out
aec67ad9a396d1219b61dd392b23471d5c9347a3 02-Dec-2015 Devin Kim <dojip.kim@lge.com> Do not test AudioPlayback if system doesn't have audio out

If the system doesn't have audio out feature, the following tests are
not valid.

android.media.cts.AudioTrackTest#testVariableSpeedPlayback
android.media.cts.MediaSyncTest#testPlayAudio

Bug: 25693353
Bug: 25687824
Change-Id: I3814fc57bc6b897270d0001e767fcd1f40a25647
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/MediaSyncTest.java
d1e3fd74222a5e491ea80520f81d3b7df8300c6b 24-Nov-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d am: b2de036e3b am: a4f15c619b am: 79dae3ced2 am: 38ddc6b7ee
am: 133a1083a3

* commit '133a1083a3d5389fec9ae2d064177ad9ba0fbe6e':
Fix bugs regarding CTS fails for VP8 codec with low performance
133a1083a3d5389fec9ae2d064177ad9ba0fbe6e 24-Nov-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d am: b2de036e3b am: a4f15c619b am: 79dae3ced2
am: 38ddc6b7ee

* commit '38ddc6b7eec76e7371e6c0c3ac213724131db381':
Fix bugs regarding CTS fails for VP8 codec with low performance
a4f15c619b43e15a2f83ebf742fe609cf892dee0 24-Nov-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d
am: b2de036e3b

* commit 'b2de036e3bb734cb2071ec51a9e2a73af17e2fe6':
Fix bugs regarding CTS fails for VP8 codec with low performance
b2de036e3bb734cb2071ec51a9e2a73af17e2fe6 24-Nov-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a
am: 8575f8995d

* commit '8575f8995d737e150c50ac17031630d64d2b2c21':
Fix bugs regarding CTS fails for VP8 codec with low performance
8575f8995d737e150c50ac17031630d64d2b2c21 24-Nov-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21
am: 8a017dc88a

* commit '8a017dc88a3833c29f5ce491d64e079841ea895a':
Fix bugs regarding CTS fails for VP8 codec with low performance
8a017dc88a3833c29f5ce491d64e079841ea895a 24-Nov-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9
am: 7410ffbe21

* commit '7410ffbe21e812af6e4b8225d61a333394a39c5a':
Fix bugs regarding CTS fails for VP8 codec with low performance
7410ffbe21e812af6e4b8225d61a333394a39c5a 24-Nov-2015 Daniel Xie <dxie@google.com> Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev
am: 3d9381b5f9

* commit '3d9381b5f96638e447812b312e2fce6b5a7198ca':
Fix bugs regarding CTS fails for VP8 codec with low performance
3bdf262245bdbe44af4d305273d8d59457afb8f1 19-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e am: dee2733f7d am: a700c60aa2 am: 58e13630f9 am: 16f2c28849
am: e7b3652389

* commit 'e7b36523896a37fb08690e3bb15f45d46a1c0f8d':
Basic test of android.media.RemoteController
e7b36523896a37fb08690e3bb15f45d46a1c0f8d 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e am: dee2733f7d am: a700c60aa2 am: 58e13630f9
am: 16f2c28849

* commit '16f2c28849faa7140eda8dcd6ad5618dbaab9614':
Basic test of android.media.RemoteController
a700c60aa2297b53fc7a0c6359c28af916849469 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4 am: c16242429e
am: dee2733f7d

* commit 'dee2733f7d2ff6f6ac5d759e0b850e8d2b8d30b4':
Basic test of android.media.RemoteController
dee2733f7d2ff6f6ac5d759e0b850e8d2b8d30b4 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274 am: b2561e7cf4
am: c16242429e

* commit 'c16242429e93e9b881c28ea545716c25c76e7b59':
Basic test of android.media.RemoteController
c16242429e93e9b881c28ea545716c25c76e7b59 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5 am: 96bb88c274
am: b2561e7cf4

* commit 'b2561e7cf427ae063d7c787e1a1a11c26572f7f7':
Basic test of android.media.RemoteController
b2561e7cf427ae063d7c787e1a1a11c26572f7f7 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e am: a9abb916f5
am: 96bb88c274

* commit '96bb88c274618f04c836210a5c2625c5aa78341c':
Basic test of android.media.RemoteController
7616ff3c40fd99a15458a64f7d5cc6d490c693d2 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564 am: 92c77216ca am: d63af2521f am: b7e8aa3bfc
am: a6f0d088a9

* commit 'a6f0d088a9e2d7f2926084ccceedc0e363ef4cd8':
media: DecoderTest: make sure we call AudioTrack.stop()
2e0ebdcfbd1c04c3cf31f3a8a6ce176964543c14 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b am: 62310b9918 am: c5139d9b7b am: d636fb8c6d
am: 8bc633eca3

* commit '8bc633eca37eef0e545fc827176f2f191a87eea4':
media: Add volatile to mThreadStarted to make sure the thread can stop properly.
a0473bcb0f31ce3d5386a97ae3a1b32bfc788a46 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8 am: 5a854f3083 am: 70e20db093 am: cc3a3a95ad
am: 9d2591354f

* commit '9d2591354f1d5216ffbe066cff77cf34dc35ead7':
EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer
4f319ab00f135ff17d1393750b7d9e4c4eaabbd2 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564 am: 92c77216ca am: d63af2521f am: b7e8aa3bfc
am: a6f0d088a9

* commit 'a6f0d088a9e2d7f2926084ccceedc0e363ef4cd8':
media: DecoderTest: make sure we call AudioTrack.stop()
b598bec956f02bda3eabf3191a344975f20c8867 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b am: 62310b9918 am: c5139d9b7b am: d636fb8c6d
am: 8bc633eca3

* commit '8bc633eca37eef0e545fc827176f2f191a87eea4':
media: Add volatile to mThreadStarted to make sure the thread can stop properly.
b53f1563e3fed8a1c3d2af12f03cccc6bdda0c7a 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8 am: 5a854f3083 am: 70e20db093 am: cc3a3a95ad
am: 9d2591354f

* commit '9d2591354f1d5216ffbe066cff77cf34dc35ead7':
EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer
96bb88c274618f04c836210a5c2625c5aa78341c 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3 am: c2114b471d am: c36419080e
am: a9abb916f5

* commit 'a9abb916f529080b8c5648dfd74cb93b23f422b8':
Basic test of android.media.RemoteController
c36419080eb5a7f5df05ae056162b7aed90f21f3 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf am: 8a27d7aab3
am: c2114b471d

* commit 'c2114b471debb2e1fb8fca29e9a8798f58eaa42c':
Basic test of android.media.RemoteController
d63af2521fb8eabbf91528f293ee6aad21dae123 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev am: c600e14564
am: 92c77216ca

* commit '92c77216cad817c774f1f2a5dc34e9ede2d6a0c5':
media: DecoderTest: make sure we call AudioTrack.stop()
c2114b471debb2e1fb8fca29e9a8798f58eaa42c 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev am: e48654cb7a am: 29e4a3bedf
am: 8a27d7aab3

* commit '8a27d7aab3807ffb322514edd69eb683debc1bdb':
Basic test of android.media.RemoteController
c5139d9b7ba5daa1d01cb8233f2119b3274ca26a 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev am: b358cbfe8b
am: 62310b9918

* commit '62310b991843ffd7d47632e172dbb0e104e84814':
media: Add volatile to mThreadStarted to make sure the thread can stop properly.
70e20db0935d5e571b1825f99c16a7faac52f86e 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer" into marshmallow-cts-dev am: 6b33b0add8
am: 5a854f3083

* commit '5a854f3083914a7db3856175a8b7b85170956d83':
EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer
d9efe7ad69a351621f1e0e8282bc182d4b789ca2 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest." into marshmallow-cts-dev
c600e145643efe7092c9f999be01975b1dd1957e 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: DecoderTest: make sure we call AudioTrack.stop()" into marshmallow-cts-dev
29e4a3bedfc6e23cc4fef128624ac540e2909a84 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "Basic test of android.media.RemoteController" into kitkat-cts-dev
am: e48654cb7a

* commit 'e48654cb7ab0736a02231d003876cdabfc4d5cf8':
Basic test of android.media.RemoteController
b358cbfe8b38110f635bbcf291b42b0c09943989 17-Nov-2015 Daniel Xie <dxie@google.com> Merge "media: Add volatile to mThreadStarted to make sure the thread can stop properly." into marshmallow-cts-dev
e612a9edc40a595a3b250f7d213fa1e045506e8b 13-Nov-2015 Nicholas Sauer <nicksauer@google.com> Basic test of android.media.RemoteController

bug:24383864
Change-Id: I8907f5432a60b85149fb2974cf0016ad89cc9c9c
rc/android/media/cts/RemoteControllerTest.java
4e485e6f2dd5667a650ed37096ae08d28ef08841 11-Nov-2015 Marco Nelissen <marcone@google.com> EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer

Otherwise we might end up in a sitation where we wait forever
to dequeue in input buffer, with the decoder waiting for us to
dequeue an output buffer first.

Bug: 25389130
Change-Id: I39af24da2b11bce93ee6af5e8ed13ac7ceb97e26
rc/android/media/cts/EncodeDecodeTest.java
9fb50b690f226f375534fb91d8a0ac8646c36b01 20-Oct-2015 eunim.ko <eunim.ko@lge.com> Fix bugs regarding CTS fails for VP8 codec with low performance

1. VP8 codec on QCom 8x10 chipset supports up to FWVGA(864x480) resolution.
When below test cases try to play 720P contents using VP8 codec,
QCom VP8 codec returns error while configuring codec.
android.media.cts.EncodeDecodeTest#testVP8EncodeDecodeVideoFromBufferToBuffer720p
android.media.cts.EncodeDecodeTest#testVP8EncodeDecodeVideoFromBufferToSurface720p
android.media.cts.EncodeDecodeTest#testVP8EncodeDecodeVideoFromSurfaceToSurface720p

So, I added codes to skip test when test codecs meet over max resolution
before configure codec.

Change-Id: Ie346a6dd5acc9a875091d14b9847f84ff717ee61
Signed-off-by: Eunim Ko <eunim.ko@lge.com>
rc/android/media/cts/EncodeDecodeTest.java
e3d326e2c66563db6c22fb04a2ed264c2e028b03 13-Jun-2014 Hurri Lu <jlu32@marvell.com> DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated

testVirtualDisplayRecycles some time failed in function updateTexImageIfNecessary for numTextureUpdated < 0.
The reason is there is no protection for mNumTextureUpdated. The issue happens in following sequence:
1. recreateWindows is called and DO_RECREATE_WINDOWS message is sent to CompositionHandler
2. onFrameAvailabe is called for previous GlWindow content update, mNumTextureUpdated is increased and
DO_RENDERING message is sent to CompositionHandler
3. DO_RECREATE_WINDOWS message is handled and mNumTextureUpdated reset to 0 for mTopWindow is recreated.
4. DO_RENDERING message is handled, mNumTextureUpdated.getAndDecrement return -1, then case failed.

how to fix: Send DO_RENDERING message w/ mTopWindow as obj parameter, do nothing if message.obj != mTopWindow
when handle the message.

Change-Id: I3ee2128149f0bb67ce640212414ab95aeab24ab1
Signed-off-by: Hurri Lu <jlu32@marvell.com>
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
3bd3ccca39e5532defabc5c3cd2bdaf983b4ddb6 06-Nov-2015 rago <rago@google.com> DO NOT MERGE: Improved LoudnessEnhancer audio effect tests

Excercised more API calls for enabling and disabling the effect.
Makes use of the Visualizer effect to measure the actual audio changes
made bythe effect

bug: 10967161
(cherry picked from commit:50aec1302c6506d6ea3d563c211692e01bd80902)

Change-Id: I970d7e900214b6d88cd3dd49f78d33bf6a6b3cd3
rc/android/media/cts/LoudnessEnhancerTest.java
rc/android/media/cts/PostProcTestBase.java
c8a9a00d25dcfbc8c2cf3e0e20166863ec37520c 24-Oct-2015 Andy Hung <hunga@google.com> Enable test of events occuring after AudioRecord.stop

Bug: 24744966
Change-Id: I27ecd23f5e35cd4f2cd98240fe80d98ef7f197f5
rc/android/media/cts/AudioRecordTest.java
3cf33b62b0b043da2360c6aace5d9531571ee6a6 05-Nov-2015 Daniel Xie <dxie@google.com> Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage"

This reverts commit a786250210bd93c06e43846a95bff067139c193b.

Change-Id: I35e0ab0f7dd1f64b98ca9dc4ba27db6bc1971cc6
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
c8910870d715496e2aa5127b76deed2895668da7 04-Nov-2015 Ronghua Wu <ronghuawu@google.com> media: Add volatile to mThreadStarted to make sure the thread can stop properly.

Bug: 25446694
Change-Id: I85a6caeb6f06bffb97be572a93374b5e8c0f64ca
rc/android/media/cts/MediaCodecCencPlayer.java
a786250210bd93c06e43846a95bff067139c193b 02-Jul-2014 Harry Hong <harryhong77@gmail.com> DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage

TestVirtualDisplayRecycles allocates lots of memory.
in low memory system, this test get failed because
android.media.cts process died by low-memory killer easily.

To prevent low memory case during test,
- clear the allocated buffer for dalvik to get more chance
to do GC at window cleanup
- call cleanupGl() at stopComposition

Change-Id: I1c118ceba9dfe29a84bd9edad43eac21ba50a92b
Signed-off-by: Harry Hong <hhong@nvidia.com>
(cherry picked from commit caf25cf58f45c3c2039de16d37242deab0e45c57)
(cherry picked from commit 1c01e9d1bb4724b983e9d756ce7238a162f9f7a2)
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
1b64814d7af367ddc7b3a7152323b52ff5f06787 16-Oct-2015 Eric Laurent <elaurent@google.com> media: DecoderTest: make sure we call AudioTrack.stop()

Make sure stop() is called on the AudioTrack once all buffers
have been written to avoid an underrun condition at the end of test.

bug: 22978539.
Change-Id: Ib8710a6416756a9aac179ff106c5107e4ae6dcb1
rc/android/media/cts/CodecState.java
rc/android/media/cts/NonBlockingAudioTrack.java
853ed6a4d0f81a619e66921afde69978afd53af3 26-Oct-2015 Andy Hung <hunga@google.com> Merge "Enable test of events occuring after AudioRecord.stop"
70651d197016bfbbfa7ac834dabfa601e6a73615 24-Oct-2015 Andy Hung <hunga@google.com> Enable test of events occuring after AudioRecord.stop

Bug: 24744966
Change-Id: I27ecd23f5e35cd4f2cd98240fe80d98ef7f197f5
rc/android/media/cts/AudioRecordTest.java
0b8a4c07cdeb516e9f885199fe2da5464adcf9da 23-Sep-2015 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest.

Bug: 23587558
Bug: 24259924
Change-Id: Ib837e0e52035fdf3e12988a94aaae72f87882c8e
es/raw/video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/VideoDecoderPerfTest.java
3ea324ef51681cf8a0bf514c7c2376af6fa961d2 24-Oct-2015 Andy Hung <hunga@google.com> Merge "Remove build warning"
bbfca9fa420a00b46b9c526b76f9b56aa388e5ee 24-Oct-2015 Andy Hung <hunga@google.com> Remove build warning

Change-Id: I0af5a425917dce63ce866d6afd0a5d70925a6b17
ibaudiojni/sl-utils.cpp
7b1998bfb4b7a6d806501a7a3adf9079b4fe7a08 23-Oct-2015 Daniel Xie <dxie@google.com> Merge "cts: Skip encodeDecode tests when there is no needed encoder" into marshmallow-cts-dev am: 05d50e377e am: 050410d08c am: b757eb50b9 am: d83b49246c am: 37ee055824
am: 79ad5689e9

* commit '79ad5689e960c5afd98e225a5b15ab14b60a8092':
cts: Skip encodeDecode tests when there is no needed encoder
79ad5689e960c5afd98e225a5b15ab14b60a8092 23-Oct-2015 Daniel Xie <dxie@google.com> Merge "cts: Skip encodeDecode tests when there is no needed encoder" into marshmallow-cts-dev am: 05d50e377e am: 050410d08c am: b757eb50b9 am: d83b49246c
am: 37ee055824

* commit '37ee05582423ea1c63fb7a86299c5e55c48b4a86':
cts: Skip encodeDecode tests when there is no needed encoder
b757eb50b9030192b326865678f2df6f2519af67 23-Oct-2015 Daniel Xie <dxie@google.com> Merge "cts: Skip encodeDecode tests when there is no needed encoder" into marshmallow-cts-dev am: 05d50e377e
am: 050410d08c

* commit '050410d08cf0b19a8180aae0fa928f7728be63bc':
cts: Skip encodeDecode tests when there is no needed encoder
54b30b75064ead48eb22322c9fd281b4febaabde 23-Oct-2015 Wei Jia <wjia@google.com> Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into mnc-dr-dev am: f6e1933ec5 am: 7f3bbe3e38 am: cc03b90968
am: 6f6db2aa98

* commit '6f6db2aa98ec10985bade9542e34ddb6e0bd2eb8':
MediaMetadataRetrieverTest: add new test to handle overflowed padding.
3905dd3f243980f316d32d2ad9f8cc6ea4378e39 29-Sep-2015 Prashant Malani <pmalani@google.com> cts: Skip encodeDecode tests when there is no needed encoder

Bug: 24345906
Change-Id: I81f9f7b8934a99a50690e6bcbbd2a17b64d36714
rc/android/media/cts/EncodeDecodeTest.java
6f6db2aa98ec10985bade9542e34ddb6e0bd2eb8 23-Oct-2015 Wei Jia <wjia@google.com> Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into mnc-dr-dev am: f6e1933ec5 am: 7f3bbe3e38
am: cc03b90968

* commit 'cc03b90968688621b5015076e66d393b3726329b':
MediaMetadataRetrieverTest: add new test to handle overflowed padding.
f6e1933ec5c1f84a41d802fb9ae7c25ffd702785 23-Oct-2015 Wei Jia <wjia@google.com> Merge "MediaMetadataRetrieverTest: add new test to handle overflowed padding." into mnc-dr-dev
25a419a985d4cf1dbee99f115a180fc2159a3863 23-Oct-2015 Daniel Xie <dxie@google.com> Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev am: 0e4cf34f73 am: 23c9de03cc am: bf1dcfff89
am: 06a665dbe3

* commit '06a665dbe3e44f5a2efeb46116acc01cec983bff':
DO NOT MERGE Add running time hints to CTS package config
23c9de03cc40ae27cabf6ca598f6281f4c8f7894 23-Oct-2015 Daniel Xie <dxie@google.com> Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev
am: 0e4cf34f73

* commit '0e4cf34f7379a19647fc39c56b1a37551bb362c0':
DO NOT MERGE Add running time hints to CTS package config
90cbf479faec8e8c902c622e1b7986f997841592 20-Oct-2015 Jed Estep <jestep@google.com> DO NOT MERGE Add running time hints to CTS package config

Bug: 25021379
Change-Id: Id0da281d4dc5345933a50e6ec4976d8b25207890
ndroid.mk
0e4cf34f7379a19647fc39c56b1a37551bb362c0 23-Oct-2015 Daniel Xie <dxie@google.com> Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev
1eb54763f9f49bf6b00c4e747427a12823a84a6a 22-Oct-2015 Andy Hung <hunga@google.com> resolve merge conflicts of 1c47219115 to master.

Change-Id: I44d4a8bed35b3c46e475f6b56fe977ba2434b34a
1c47219115da15a9b8dd2b8a6e5abb6deadaa12d 22-Oct-2015 Daniel Xie <dxie@google.com> Merge "AudioRecordTest: Remove assert check on cold input start time" into marshmallow-cts-dev am: 1273b567c9 am: 37ae3d05a9 am: cdc018c6b9 am: 0ea500dfa1
am: 54775fa980

* commit '54775fa9803963017f2783f8e8858f4aa1a13ed4':
AudioRecordTest: Remove assert check on cold input start time
cdc018c6b918758d36548bcf3568f81fb70eb045 22-Oct-2015 Daniel Xie <dxie@google.com> Merge "AudioRecordTest: Remove assert check on cold input start time" into marshmallow-cts-dev am: 1273b567c9
am: 37ae3d05a9

* commit '37ae3d05a9e4e3e23771e792ff671f00cee0aab7':
AudioRecordTest: Remove assert check on cold input start time
37b9b9b1e9c9e6f511a6e7483dc774b68aa2f4e0 21-Oct-2015 Andy Hung <hunga@google.com> AudioRecordTest: Remove assert check on cold input start time

Reduced to logcat warning.
Assert may be reinstated at a later time.

Bug: 25112381
Change-Id: I0ab03a4f23e9a204875a75a770e440884bf728a9
rc/android/media/cts/AudioRecordTest.java
6aab9db414b3fbcc71cbf6b6a15fa7ef8e00d862 20-Oct-2015 Jed Estep <jestep@google.com> DO NOT MERGE Add running time hints to CTS package config

Bug: 25021379
Change-Id: Id0da281d4dc5345933a50e6ec4976d8b25207890
ndroid.mk
79a816d6c08e18870e52c67f6ddbd7b89d3c973a 21-Oct-2015 Bill Yi <byi@google.com> Merge remote-tracking branch 'goog/mnc-cts-release' into HEAD
3f91a20897ec66e32aa6e01ee48712fb222d462f 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev am: 5f07bef9a4 am: d67e2c47dc am: 35459b81d7 am: 3835dd89e3 am: e603322f2b
am: 9b8f5c50df

* commit '9b8f5c50df581375d41e036b904c1f2c1e1cf1e2':
testReleaseAfterFlush: extend to audio encoders
1cf7c2d76e03188a82abf61bbe8a13170421edfc 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev am: e138dac7c6 am: f390974749 am: 41b05e7734 am: 027c25e6ec am: cdabe098cb
am: 1293b84af5

* commit '1293b84af54f84aa1d8e9218746d13940ddacbb2':
testDecodeAfterFlush: extend to audio
0e10cf950c78d5368aba633b814da495bb97e8cf 20-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: add mpeg4 qcif test to VideoDecoderPerfTest." into mnc-dr-dev am: f9ffc5c068 am: 8022371a24 am: 776cb0ffd4
am: 8284a25c85

* commit '8284a25c8550fac91870936b68c8af6bee3d9f66':
media: add mpeg4 qcif test to VideoDecoderPerfTest.
9b8f5c50df581375d41e036b904c1f2c1e1cf1e2 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev am: 5f07bef9a4 am: d67e2c47dc am: 35459b81d7 am: 3835dd89e3
am: e603322f2b

* commit 'e603322f2b4f5ebeecc490d3131799ed28d35446':
testReleaseAfterFlush: extend to audio encoders
1293b84af54f84aa1d8e9218746d13940ddacbb2 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev am: e138dac7c6 am: f390974749 am: 41b05e7734 am: 027c25e6ec
am: cdabe098cb

* commit 'cdabe098cb3a6daac151ba1c53ae841228495fdb':
testDecodeAfterFlush: extend to audio
35459b81d79b9c2376ecb708b1b58d663b831577 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev am: 5f07bef9a4
am: d67e2c47dc

* commit 'd67e2c47dc891a3942d884f1edd888e53e635333':
testReleaseAfterFlush: extend to audio encoders
41b05e77347accfe3abc7694cc4cf24da4e66452 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev am: e138dac7c6
am: f390974749

* commit 'f390974749f9c3a52ce8c3d21480102a42a156bb':
testDecodeAfterFlush: extend to audio
d67e2c47dc891a3942d884f1edd888e53e635333 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev
am: 5f07bef9a4

* commit '5f07bef9a402ef7242362c8c30941f9f14e4364d':
testReleaseAfterFlush: extend to audio encoders
f390974749f9c3a52ce8c3d21480102a42a156bb 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testDecodeAfterFlush: extend to audio" into marshmallow-cts-dev
am: e138dac7c6

* commit 'e138dac7c6a12ba79f16e65563ef7c76d0f3a561':
testDecodeAfterFlush: extend to audio
5f07bef9a402ef7242362c8c30941f9f14e4364d 20-Oct-2015 Daniel Xie <dxie@google.com> Merge "testReleaseAfterFlush: extend to audio encoders" into marshmallow-cts-dev
8284a25c8550fac91870936b68c8af6bee3d9f66 20-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: add mpeg4 qcif test to VideoDecoderPerfTest." into mnc-dr-dev am: f9ffc5c068 am: 8022371a24
am: 776cb0ffd4

* commit '776cb0ffd477b5b01fab281afd14f32718f1d0b2':
media: add mpeg4 qcif test to VideoDecoderPerfTest.
f9ffc5c0686c626413cd5912504ddd314dce6597 20-Oct-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: add mpeg4 qcif test to VideoDecoderPerfTest." into mnc-dr-dev
d30195733762a93d34e5e436f7c5a2519c4707ec 16-Oct-2015 Robert Shih <robertshih@google.com> testReleaseAfterFlush: extend to audio encoders

Also skip test on unsupported codecs.

Bug: 24345187
Change-Id: I0ecfadaf41f032709a93cf7844abf0eb7ca0eb28
rc/android/media/cts/MediaCodecTest.java
a41d49723a200eec6af9c9504a961cb2df306295 20-Oct-2015 Daniel Xie <dxie@google.com> Squashed mnc-dev changes:

This contains all of the changes from b54aa51 to
791e51a on mnc-dev, except the changes
to tests/tests/security.

Bug: 24846656
Change-Id: I01f53a1a238ac49f86928e0e22796dc73e0e34af
es/raw/on_input_buffer_filled_sigsegv.mp4
es/raw/video_1920x1080_mp4_h264_20480kbps_60fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/JetPlayerTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaRecorderTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
rc/android/media/cts/VideoEncoderTest.java
1a9e4e5e0381f7137f2a635cbb34516e76a3ebca 17-Oct-2015 Robert Shih <robertshih@google.com> testDecodeAfterFlush: extend to audio

Also set completion flag if skipping test.

Bug: 24345187
Change-Id: I047ad32e8e27cf689d0acf91134e40435fa43904
rc/android/media/cts/MediaCodecTest.java
13c1585464a6ba445180e4d0d7d20aaaa418fcee 17-Oct-2015 Wei Jia <wjia@google.com> MediaMetadataRetrieverTest: add new test to handle overflowed padding.

Bug: 24623447
Change-Id: Ida117b2386199083a938ef0e24392c849f6b52ea
es/raw/id3v2_3_extended_header_overflow_padding.mp3
rc/android/media/cts/MediaMetadataRetrieverTest.java
3027818e52996168ec138c7f9a29298e67eec712 16-Oct-2015 Daniel Xie <dxie@google.com> am eb72a625: am ed166dad: am 6b1c2d57: am 83adc853: am d5c87339: am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit 'eb72a6252f85c263ab63b25ef26b1c9bbc0da67a':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
eb72a6252f85c263ab63b25ef26b1c9bbc0da67a 16-Oct-2015 Daniel Xie <dxie@google.com> am ed166dad: am 6b1c2d57: am 83adc853: am d5c87339: am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit 'ed166dadc5359041e90cb03d2a2515e948996863':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
d5c87339cb96360401eed84428dfc5c5a50b9f73 16-Oct-2015 Daniel Xie <dxie@google.com> am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit 'e913a7aa106240158bbb0ce846b99995c5190889':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
e913a7aa106240158bbb0ce846b99995c5190889 16-Oct-2015 Daniel Xie <dxie@google.com> am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit '79b7ea9f573157a880ac87bd85c92d4cd40d9234':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
79b7ea9f573157a880ac87bd85c92d4cd40d9234 16-Oct-2015 Daniel Xie <dxie@google.com> am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit 'cef64655f0912c11b3c917ccbe7bc6252bab6979':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
cef64655f0912c11b3c917ccbe7bc6252bab6979 16-Oct-2015 Daniel Xie <dxie@google.com> am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit '18a2e91831be84c2a328d98267e1f0d2d89ffc38':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
ff0d56fb0b8654740df4838139e041b512bf5b2d 16-Oct-2015 Daniel Xie <dxie@google.com> am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit '71c0d241722cc55f560443b0b139c655e9619d06':
Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080
2a920dbbab01702418621752618b62f3dd963b9a 15-Oct-2015 Kuldeep Modi <kuldeep.modi@samsung.com> Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080

Adding video_1920x1080_mp4_h264_20480kbps_60fps_aac_stereo_128kbps_44100hz.mp4 which supports
AVC base line profile which is supported by AVC decoder.

Signed-off-by: Kuldeep Modi <kuldeep.modi@samsung.com>
es/raw/video_1920x1080_mp4_h264_20480kbps_60fps_aac_stereo_128kbps_44100hz.mp4
f08dc24984684526df26e75f1c4834df4f48a625 23-Sep-2015 Ronghua Wu <ronghuawu@google.com> media: add mpeg4 qcif test to VideoDecoderPerfTest.

Bug: 23587558
Bug: 24259924
Change-Id: Ib837e0e52035fdf3e12988a94aaae72f87882c8e
es/raw/video_176x144_mp4_mpeg4_300kbps_25fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/VideoDecoderPerfTest.java
4e13580583f4a8d6e9bcb5a9b7121a1fa3185735 30-Sep-2015 Aaron Holden <aaronholden@google.com> CTS Media Files Precondition

Verify media files are present on the device before running CTS,
and push them to the device if not

bug:23939594
Change-Id: Ie9e64d414e45ada97a9bece36e703e46add5edb7
ndroidTest.xml
e5a6f04c20fb4a74c8058bf1b00aae39fcd07694 13-Oct-2015 Marco Nelissen <marcone@google.com> am 0a544ca1: am 0d721980: am 57e325c6: Merge "Test for correct looping/completion behavior"

* commit '0a544ca1d180c91a830f025415464935217ed107':
Test for correct looping/completion behavior
0a544ca1d180c91a830f025415464935217ed107 12-Oct-2015 Marco Nelissen <marcone@google.com> am 0d721980: am 57e325c6: Merge "Test for correct looping/completion behavior"

* commit '0d721980d83900a701e837fe06499d4606c817cf':
Test for correct looping/completion behavior
0d721980d83900a701e837fe06499d4606c817cf 12-Oct-2015 Marco Nelissen <marcone@google.com> am 57e325c6: Merge "Test for correct looping/completion behavior"

* commit '57e325c6024319b19253b5549c1f9cd8717b7875':
Test for correct looping/completion behavior
c87c845e78c253d88ce4fbac03d9bc62b6bd056d 09-Oct-2015 Daniel Xie <dxie@google.com> am d2a10c91: am 765bffec: am ff0aa1fe: am 094f79aa: am d5e4e53b: Merge "Check for presence of video codec before testPlayHlsStreamWithTimedId3" into mnc-dev

* commit 'd2a10c9174bddd6d2666699a4ff76a581d0afb1a':
Check for presence of video codec before testPlayHlsStreamWithTimedId3
1f6d39aebda8751159bca7f565e0b31547a3b354 08-Oct-2015 Marco Nelissen <marcone@google.com> Test for correct looping/completion behavior

Bug: 18656047
Change-Id: I58f7e55a6fd727a5ca46c7b1e2c7175ba0ae12ea
rc/android/media/cts/MediaPlayerTest.java
1bf91b255d450319a4d05570b20cd9602c97845d 06-Oct-2015 Stuart Scott <stuartscott@google.com> Remove common-config and switch to AndroidJUnitTest.

bug:21762834
Change-Id: I17e1b44e4429a3fbeb9f110a74038e4ec306af38
ndroidTest.xml
e2f380f61f96cf3b94820bcf16f32bb24f1ebad6 06-Oct-2015 Robert Shih <robertshih@google.com> Check for presence of video codec before testPlayHlsStreamWithTimedId3

Bug: 24345920
Change-Id: Idc9f9313db7dc6d5c613eca04dcd0846c390a033
rc/android/media/cts/StreamingMediaPlayerTest.java
0e10c5c4a42c3468c04c6bc4ebac1d320c5d82ee 02-Oct-2015 Prashant Malani <pmalani@google.com> am dc243097: am af3921f6: am 52f1d860: am 60912b76: am 944afaa1: Merge "cts: Check for video codec on some MediaRecorder Tests" into mnc-dev

* commit 'dc2430979ec3243f7ebd131e02a9eda4b589745c':
cts: Check for video codec on some MediaRecorder Tests
19c4025a0a39c42f89812a0ce77a5426290942f4 30-Sep-2015 Prashant Malani <pmalani@google.com> cts: Check for video codec on some MediaRecorder Tests

Some of the tests assume the presence of a video codec. This is not
always true. So, on such devices, those tests are skipped.

Bug: 24345197
Change-Id: Ia9403f817a44250f4a0b57b9aa4d389635358f36
rc/android/media/cts/MediaRecorderTest.java
53f27ce6e27cb762afa49cbeae977d0831a916f6 25-Sep-2015 Aaron Holden <aaronholden@google.com> CTS_v2 migration for media tests

bug:21762834
Change-Id: I2a7c8b76e87f332c3831cc14f098ec568a8fd5b8
ndroid.mk
ndroidManifest.xml
ndroidTest.xml
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/AudioEffectTest.java
rc/android/media/cts/AudioManagerStub.java
rc/android/media/cts/AudioManagerTest.java
rc/android/media/cts/AudioPreProcessingTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/EncoderTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/FaceDetectorStub.java
rc/android/media/cts/FaceDetectorTest.java
rc/android/media/cts/FaceDetector_FaceTest.java
rc/android/media/cts/ImageReaderDecoderTest.java
rc/android/media/cts/JetPlayerTest.java
rc/android/media/cts/LoudnessEnhancerTest.java
rc/android/media/cts/MediaBrowserServiceTest.java
rc/android/media/cts/MediaBrowserTest.java
rc/android/media/cts/MediaCodecTest.java
rc/android/media/cts/MediaExtractorTest.java
rc/android/media/cts/MediaMetadataRetrieverTest.java
rc/android/media/cts/MediaMuxerTest.java
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
rc/android/media/cts/MediaPlayerSurfaceStubActivity.java
rc/android/media/cts/MediaPlayerSurfaceTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaRandomTest.java
rc/android/media/cts/MediaRecorderTest.java
rc/android/media/cts/MediaScannerConnectionTest.java
rc/android/media/cts/MediaScannerTest.java
rc/android/media/cts/MediaStubActivity.java
rc/android/media/cts/MediaSyncTest.java
rc/android/media/cts/NativeDecoderTest.java
rc/android/media/cts/ParamsTest.java
rc/android/media/cts/ResourceManagerTest.java
rc/android/media/cts/RingtoneManagerTest.java
rc/android/media/cts/SoundPoolAacTest.java
rc/android/media/cts/SoundPoolMidiTest.java
rc/android/media/cts/SoundPoolOggTest.java
rc/android/media/cts/SoundPoolTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
rc/android/media/cts/VideoEditorTest.java
rc/android/media/cts/VideoEncoderTest.java
rc/android/media/cts/VideoSurfaceView.java
rc/android/media/cts/VirtualizerTest.java
rc/android/media/cts/VisualizerTest.java
rc/android/media/cts/Vp8CodecTestBase.java
rc/android/media/cts/Vp8EncoderTest.java
203f6997c6e4538af66e02d1c76300f201b3e4d8 12-Aug-2015 Chong Zhang <chz@google.com> cts: get video size from CamcorderProfile -- DO NOT MERGE

bug: 23036810
bug: 23972679
Change-Id: I35524cc92f6e1ee7d1df2d62d044595438048ac7
(cherry picked from commit ad205439363c2d9b988628d5705913f428d09b89)
rc/android/media/cts/MediaRecorderTest.java
f6483e84dd795f79532a326d44f86902e6b0bd8b 11-Sep-2015 Robert Shih <robertshih@google.com> Add 5-second timeout to testFlacHeapOverflow

Bug: 23793209
Change-Id: If82a2094a1269805d0babdb393f2976052ed73d2
rc/android/media/cts/MediaPlayerTest.java
45eca1ea8c76321479124133e5b2e9b65fc3d7e2 11-Jun-2015 Marco Nelissen <marcone@google.com> Remove corrupt test file

One of the CTS test files was technically corrupt, and we're more
strict now so this file wasn't passing CTS anymore.

Bug: 18386956
Bug: 18872896
Bug: 21208259
Change-Id: Ie6d699649658a61692ce2ea7c2d7bc9d64668d59
(cherry picked from commit e1757df51cc86815f37b4a68ad25a60ea23d1b44)
es/raw/gb18030_5.mp3
rc/android/media/cts/MediaScannerTest.java
fe69c519508f89c2c41321bd700b233d4310bb1b 24-Sep-2015 Andy Hung <hunga@google.com> am ccc8c634: am 14b83f53: am 29a45787: am e098e286: am c7c3697c: Merge "Fix flaky AudioTrackTest#testPlayStreamData" into mnc-dev

* commit 'ccc8c6345bb703523b987ca887ed3e1c2673bb29':
Fix flaky AudioTrackTest#testPlayStreamData
248277dc6ddd66596903e32f94d658f3d2740cfa 24-Sep-2015 Andy Hung <hunga@google.com> Fix flaky AudioTrackTest#testPlayStreamData

AudioTrack.release() is not synchronous, wait for it to complete.

Bug: 24340787
Change-Id: Ib391b93223b65631f4ae2d6ea060feff0d9748bf
rc/android/media/cts/AudioTrackTest.java
6a05e31890970d4182e21b49a4cacacbfddeb651 23-Sep-2015 Chong Zhang <chz@google.com> am a43574d1: am 329d2bb8: cts: get video size from CamcorderProfile -- DO NOT MERGE

* commit 'a43574d1d508a376981a3a1e5f46eadb4b6bfedd':
cts: get video size from CamcorderProfile -- DO NOT MERGE
a43574d1d508a376981a3a1e5f46eadb4b6bfedd 23-Sep-2015 Chong Zhang <chz@google.com> am 329d2bb8: cts: get video size from CamcorderProfile -- DO NOT MERGE

* commit '329d2bb8bd20e03c3efdc60564f2e25173f80c9a':
cts: get video size from CamcorderProfile -- DO NOT MERGE
329d2bb8bd20e03c3efdc60564f2e25173f80c9a 12-Aug-2015 Chong Zhang <chz@google.com> cts: get video size from CamcorderProfile -- DO NOT MERGE

bug: 23036810
bug: 23972679
Change-Id: I35524cc92f6e1ee7d1df2d62d044595438048ac7
(cherry picked from commit ad205439363c2d9b988628d5705913f428d09b89)
rc/android/media/cts/MediaRecorderTest.java
594963dd405bb80eceeccfa9eac0219511ae1950 23-Sep-2015 Chong Zhang <chz@google.com> am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE

* commit 'd61c8d39cc14a8f1b6cce5d7885029e241981bb3':
cts: get video size from CamcorderProfile -- DO NOT MERGE
d21bfade9a211de6549bc8782b42e4dc21cfe7bc 23-Sep-2015 Daniel Xie <dxie@google.com> Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev
ad205439363c2d9b988628d5705913f428d09b89 12-Aug-2015 Chong Zhang <chz@google.com> cts: get video size from CamcorderProfile -- DO NOT MERGE

bug: 23036810
bug: 23972679
Change-Id: I35524cc92f6e1ee7d1df2d62d044595438048ac7
rc/android/media/cts/MediaRecorderTest.java
4f378d75aa906eddde7914cdb94952e97a7affc4 12-Aug-2015 Chong Zhang <chz@google.com> cts: get video size from CamcorderProfile -- DO NOT MERGE

bug: 23036810
bug: 23972679
Change-Id: I35524cc92f6e1ee7d1df2d62d044595438048ac7
rc/android/media/cts/MediaRecorderTest.java
41ceca82ef1f687ec662155769661e364e9249b9 22-Sep-2015 Daniel Xie <dxie@google.com> am 73b10e8b: am 56e870e0: am 9ef5cda3: am 28886e99: am 9e45aaac: am b470f709: am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours

* commit '73b10e8be49236f747f6593bf959af84eddbcc74':
9e45aaacf1b6e11243dc5e8193b47e0d405fcb4f 22-Sep-2015 Daniel Xie <dxie@google.com> am b470f709: am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours

* commit 'b470f709e65767343129b1629c41160085cd03da':
b470f709e65767343129b1629c41160085cd03da 22-Sep-2015 Daniel Xie <dxie@google.com> am 4aabe52f: am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours

* commit '4aabe52f138953f7aa51b814378744da466012d9':
4aabe52f138953f7aa51b814378744da466012d9 22-Sep-2015 Daniel Xie <dxie@google.com> am 3ef77189: am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours

* commit '3ef77189f0cbafeecdcc1720e48c674d8f5245c2':
2a6218d216c03b2545754fc0b7fb063a510ccd85 22-Sep-2015 Daniel Xie <dxie@google.com> am e7918277: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev

* commit 'e79182776ec0175a2944e182836915c9a572433a':
Should create a decoder from MediaCodecList
780caadd808c44a030ec6c3e3be50b9e69932ec2 22-Sep-2015 Robert Shih <robertshih@google.com> am fb2ebd2f: am 8ffcbf6f: am 16da4fcc: am a794c051: am 54135811: am b7d72084: am 23be7ed7: am b25f5bab: am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file

* commit 'fb2ebd2f2cd203942e5d741080490eed881b0802':
Test if libstagefright dies in onInputBufferFilled on currupted file
3ef77189f0cbafeecdcc1720e48c674d8f5245c2 21-Sep-2015 Daniel Xie <dxie@google.com> am 2ad28109: am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours

* commit '2ad2810910ebcfab057b253d7f2d635605d1baba':
54135811e7234990744a7495d98bcbff0ddedce1 21-Sep-2015 Robert Shih <robertshih@google.com> am b7d72084: am 23be7ed7: am b25f5bab: am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file

* commit 'b7d720849777b9d2a1c262675966846ffb7eff4d':
Test if libstagefright dies in onInputBufferFilled on currupted file
b7d720849777b9d2a1c262675966846ffb7eff4d 21-Sep-2015 Robert Shih <robertshih@google.com> am 23be7ed7: am b25f5bab: am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file

* commit '23be7ed7165f6657698b79ccc619fe4130b58239':
Test if libstagefright dies in onInputBufferFilled on currupted file
f7b647cc48f5d9fb9f898c14b70e484094a0cef3 21-Sep-2015 Andy Hung <hunga@google.com> am c755df5b: am 67a9edde: am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev

* commit 'c755df5b9b9646f6528617fe90eabfabaf67849b':
DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""
daed62a86ca6803f2f86a0247049e1daef49ac28 21-Sep-2015 Unsuk Jung <unsuk@google.com> Merge commit 'ef33f002' into mm-ef33f002
23be7ed7165f6657698b79ccc619fe4130b58239 21-Sep-2015 Robert Shih <robertshih@google.com> am b25f5bab: am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file

* commit 'b25f5bab14e4f1953c8f572f383aac007d9323e2':
Test if libstagefright dies in onInputBufferFilled on currupted file
c755df5b9b9646f6528617fe90eabfabaf67849b 21-Sep-2015 Andy Hung <hunga@google.com> am 67a9edde: am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev

* commit '67a9edde1fb03cab73ef8f91d8f70d682aca2ac3':
DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""
b25f5bab14e4f1953c8f572f383aac007d9323e2 21-Sep-2015 Robert Shih <robertshih@google.com> am ab5f43b7: am b108e0d9: am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file

* commit 'ab5f43b705f35dc4f6693331e75e5512efa674b3':
Test if libstagefright dies in onInputBufferFilled on currupted file
67a9edde1fb03cab73ef8f91d8f70d682aca2ac3 21-Sep-2015 Andy Hung <hunga@google.com> am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev

* commit 'd5833ca8b84be9cf3b071cd1f0d0bc7a25a08b28':
DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""
b108e0d9346d061a74d8b3c094c85a2af4bc3211 21-Sep-2015 Robert Shih <robertshih@google.com> am d449dd5f: am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file

* commit 'd449dd5f52a3ac47033b019da42d36d1d56c0bf9':
Test if libstagefright dies in onInputBufferFilled on currupted file
d449dd5f52a3ac47033b019da42d36d1d56c0bf9 21-Sep-2015 Robert Shih <robertshih@google.com> am 435d256a: am 62e162af: Test if libstagefright dies in onInputBufferFilled on currupted file

* commit '435d256a531250eca55b448712cee5535daa5e69':
Test if libstagefright dies in onInputBufferFilled on currupted file
ee20e9959e4133d1c206ee32fd766dbfda857dd5 21-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 55c6f110: am b03e5b12: am 05fe4249: am 9511d64b: am 16ea5a03: Merge "media: don\'t fail the test if encoder is still active." into mnc-dev

* commit '55c6f110cc7abfa17f5292aaca4b7e6e8db44fc2':
media: don't fail the test if encoder is still active.
16ea5a03743c79d642c2b9061b53ba94a8c244c0 21-Sep-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: don't fail the test if encoder is still active." into mnc-dev
874055540ec85b70256e558ca77ac6805f73bf3b 20-Sep-2015 Robert Shih <robertshih@google.com> am 03b2a014: am 436ff357: am 59c49231: am 7e8bbb26: am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow

* commit '03b2a014cbf76bad952f08fe61582669a842d2b3':
Add 5-second timeout to testFlacHeapOverflow
03b2a014cbf76bad952f08fe61582669a842d2b3 20-Sep-2015 Robert Shih <robertshih@google.com> am 436ff357: am 59c49231: am 7e8bbb26: am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow

* commit '436ff3579eef1608383b7ad043f0aedee8b1b6c0':
Add 5-second timeout to testFlacHeapOverflow
62e162aff9fb0f819447b5970e48e79ee12f53df 18-Sep-2015 Robert Shih <robertshih@google.com> Test if libstagefright dies in onInputBufferFilled on currupted file

Also catching Java Exceptions; failures are acceptable as long as they
do not involve mediaserver crashing.

Bug: 19779574
Change-Id: I5a318c4cafa1c860d2c7bf5d7b948a95b0728989
es/raw/on_input_buffer_filled_sigsegv.mp4
rc/android/media/cts/MediaPlayerTest.java
1302dd5659927314390c18afdb12f1a159f092e2 14-Sep-2015 Ronghua Wu <ronghuawu@google.com> media: don't fail the test if encoder is still active.

Bug: 24012163
Change-Id: Idcff8dda6a417feb2810dd55da10333dcca874e2
rc/android/media/cts/VideoEncoderTest.java
436ff3579eef1608383b7ad043f0aedee8b1b6c0 18-Sep-2015 Robert Shih <robertshih@google.com> am 59c49231: am 7e8bbb26: am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow

* commit '59c492317bcea5d0097476b2e67b6d2e86d2dac1':
Add 5-second timeout to testFlacHeapOverflow
59c492317bcea5d0097476b2e67b6d2e86d2dac1 18-Sep-2015 Robert Shih <robertshih@google.com> am 7e8bbb26: am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow

* commit '7e8bbb26c191ab220389d19710c21bfc39be8825':
Add 5-second timeout to testFlacHeapOverflow
fa9a3ff7b159b949cab256f725b6cdeadfc88576 17-Sep-2015 Wei Jia <wjia@google.com> am ae8af7d6: am b9149c72: am d5cb747c: am 1f46e18f: am ed49dfe8: MediaPlayerTest: temporarily disable timestamp checking for seek related operations.

* commit 'ae8af7d6e9323500d5371745cfcfacd128ce1148':
MediaPlayerTest: temporarily disable timestamp checking for seek related operations.
e3b2c603c0d900bd3d91ce1d2c6de786622388bb 17-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 776db701: am 0bacef25: am 42cbee8c: am b6929ebe: am 78460f94: Merge "media: skip unknown types for testGetMaxSupportedInstances test." into mnc-dev

* commit '776db701e0ec9253e9d616e4f4f4f2e6daf13a49':
media: skip unknown types for testGetMaxSupportedInstances test.
ed49dfe895536481b072b803206bce94b40a917b 15-Sep-2015 Wei Jia <wjia@google.com> MediaPlayerTest: temporarily disable timestamp checking for seek related operations.

Bug: 24010976
Change-Id: I52fe341fbcded9e6b7b56797e3a854b142e2083e
rc/android/media/cts/MediaPlayerTest.java
78460f943e6e09df3dd7e519faedbe917dd65095 17-Sep-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: skip unknown types for testGetMaxSupportedInstances test." into mnc-dev
9baf829307fa4ce15d46964b4e06cec540521a4b 17-Sep-2015 Andy Hung <hunga@google.com> DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""

This reverts commit 17e4046ab317d8583e3bc58cafc8df3924a430a0.

Change-Id: I053a3229b6d4d1d30caf164cd42e18ed2813ebad
rc/android/media/cts/AudioTrackTest.java
77e695b47d73daaf60b940171c12585b093b773b 09-Sep-2015 Ronghua Wu <ronghuawu@google.com> media: skip unknown types for testGetMaxSupportedInstances test.

Bug: 23802932
Change-Id: Ia4f960075ae66f6e58d78f52d09453d5ddf7bde9
rc/android/media/cts/MediaCodecCapabilitiesTest.java
080842d7fe65598854bfce9098e962e26dda07c7 15-Sep-2015 Unsuk Jung <unsuk@google.com> am 8388f73d: am f9777e93: resolved conflicts for d8f34e98 to lmp-mr1-dev

* commit '8388f73dff655db833ee3e12f09db75b73527229':
8388f73dff655db833ee3e12f09db75b73527229 15-Sep-2015 Unsuk Jung <unsuk@google.com> am f9777e93: resolved conflicts for d8f34e98 to lmp-mr1-dev

* commit 'f9777e939d12e9d0fd2ebe1610e4652b32da9b0d':
296a2ba8ea6380cce59959a101c7ef3d2f764d3b 15-Sep-2015 Tatsuhisa Yamaguchi <yamaguchi@google.com> am 26fd2388: am 3b3b7389: am b18bce3d: am 0c31acd3: am 28330115: am 8d8a7806: am e3d7e488: am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest.

* commit '26fd238865bb4fa2273ff085b7d4f9df16c4b929':
Fix build error in ExtractDecodeEditEncodeMuxTest.
f9777e939d12e9d0fd2ebe1610e4652b32da9b0d 15-Sep-2015 Unsuk Jung <unsuk@google.com> resolved conflicts for d8f34e98 to lmp-mr1-dev

Change-Id: I4c8d89465f7db6bb9bfae20792ad18f7c74141e0
343a7f0120ddab910082ae80a6f65b291b6773e4 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am 25afa649: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev

* commit '25afa649171bb3821df4029d893356393b7d8b57':
Add CTS for MediaController.Callback
c50d284722aa87a7476e5875c435656c9a5593dc 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am ccde590a: Merge "Add more CTS for MediaController" into lollipop-cts-dev

* commit 'ccde590a05032512d791a30989f7b946c3c2d22c':
Add more CTS for MediaController
5adf372c2a8b0104d22512589446a3ce06845f51 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am 4aeb538d: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev

* commit '4aeb538daf09e30dfa7dd544d4ed0831cd3a54df':
Add CTS for MediaSession.setActive()
f99cc4ba3f1204986aaa6b440a39571b56f3654e 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am b7703ecb: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev

* commit 'b7703ecb90daed0fae60d9ae684074c7b70d9018':
Add CTS for MediaBrowserService
9030efde508f1d2b8276257f62a794b1cd2b9537 15-Sep-2015 Marco Nelissen <marcone@google.com> am c18e0e89: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev

* commit 'c18e0e89dcfe415b58d260d1e458d7b23dec784f':
Use video without B frames for early EOS test
8d782e4e6b3185bb9d93f2b98b0b1ce3e575ada3 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am 62f111d0: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev

* commit '62f111d0b514ae129e57859da0708654751a4bf1':
Add CTS for MediaController.TransportControls and its callback
ad388cb47ddef9d691ff884e3a6a8b9593152eb9 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am 6d4a6d3e: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev

* commit '6d4a6d3e6c84da6d05ac55aa3dbe65ab02bdb7ee':
Add more CTS codes for MediaBrowserTest
9540df0ef793e1b6d0bc48d654200161fa31a5a6 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am 32e17d40: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev

* commit '32e17d400bd54f6ef5ea9e44c81cd51c5c41a427':
Add CTS for MediaSession.Token
b5166b1d65c1f1dc833d2becf89c750e4fdb8cbc 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am 71a8a6d7: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev

* commit '71a8a6d73a8132d33fab9824a3c7bae954ede4ec':
Add CTS for MediaBrowser
dbc90b9f6b8c3759a915c177d5f848f34e65fb1d 15-Sep-2015 Sungsoo Lim <sungsoo@google.com> am 6585d2a7: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev

* commit '6585d2a763342db3c7577736b07805f8ccd6235d':
Add CTS for MediaBrowser.MediaItem
28330115cf93ec16b0b257b4d819f3238e7e4323 15-Sep-2015 Tatsuhisa Yamaguchi <yamaguchi@google.com> am 8d8a7806: am e3d7e488: am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest.

* commit '8d8a78064f11925c9d219700fc53a3d59386e06c':
Fix build error in ExtractDecodeEditEncodeMuxTest.
8d8a78064f11925c9d219700fc53a3d59386e06c 15-Sep-2015 Tatsuhisa Yamaguchi <yamaguchi@google.com> am e3d7e488: am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest.

* commit 'e3d7e488bd9b43789a355a9a8ea7e90b6d022d3e':
Fix build error in ExtractDecodeEditEncodeMuxTest.
e3d7e488bd9b43789a355a9a8ea7e90b6d022d3e 15-Sep-2015 Tatsuhisa Yamaguchi <yamaguchi@google.com> am 0b65959b: Fix build error in ExtractDecodeEditEncodeMuxTest.

* commit '0b65959b9ed1bf30d1db9810ff0cd4ea048d2507':
Fix build error in ExtractDecodeEditEncodeMuxTest.
0b65959b9ed1bf30d1db9810ff0cd4ea048d2507 15-Sep-2015 Tatsuhisa Yamaguchi <yamaguchi@google.com> Fix build error in ExtractDecodeEditEncodeMuxTest.

Change-Id: I32f68ff14fceaafbd3e5577ce67b9b3a3d553205
(cherry picked from commit e885f7ad677c465e47f0f487cda8ee807b8bf578)
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
dcbe37cebdcbc93ee09adb8dc166347b15bd6e26 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> am 3229d3be: am 22970ce7: am 455b60e5: resolved conflicts for 1a571197 to lmp-mr1-dev

* commit '3229d3be02815368a782056044b8807515beef8c':
3229d3be02815368a782056044b8807515beef8c 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> am 22970ce7: am 455b60e5: resolved conflicts for 1a571197 to lmp-mr1-dev

* commit '22970ce7d6e364bb4062f5c0f6f97cca8b7e974b':
22970ce7d6e364bb4062f5c0f6f97cca8b7e974b 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> am 455b60e5: resolved conflicts for 1a571197 to lmp-mr1-dev

* commit '455b60e5a0ccafd7bd729ec7de6c51202f98e91a':
455b60e5a0ccafd7bd729ec7de6c51202f98e91a 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> resolved conflicts for 1a571197 to lmp-mr1-dev

Change-Id: I0d7b35b576fccd45580c540117d468bf4b46b084
4724267f01988a4d26ebc7daac31717a9cb18170 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> am 36aeb5ff: am 2448793e: am a94188c2: am 5faba701: am 9d9d6fb0: am c476913c: am 7362d0a7: am 9afd5ac2: resolved conflicts for d3063af9 to lmp-mr1-dev

* commit '36aeb5ffd9e6f79fe31bab9356cf02a85e102d1f':
9d9d6fb038f5c316afb984d0a286d8ba7e975f06 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> am c476913c: am 7362d0a7: am 9afd5ac2: resolved conflicts for d3063af9 to lmp-mr1-dev

* commit 'c476913cb75c86e56830e596b4a83149846c3d50':
c476913cb75c86e56830e596b4a83149846c3d50 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> am 7362d0a7: am 9afd5ac2: resolved conflicts for d3063af9 to lmp-mr1-dev

* commit '7362d0a7fb43912aee04ad261727455928598165':
7362d0a7fb43912aee04ad261727455928598165 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> am 9afd5ac2: resolved conflicts for d3063af9 to lmp-mr1-dev

* commit '9afd5ac2d9ea9c36958f19c77d576d58721bfcee':
9afd5ac2d9ea9c36958f19c77d576d58721bfcee 15-Sep-2015 Nicholas Sauer <nicksauer@google.com> resolved conflicts for d3063af9 to lmp-mr1-dev

Change-Id: I444280843bdb257d5546645398f3fa82069acd56
16636fc7e253c90a1c671765b3e3146a6a0754e9 15-Sep-2015 Takayuki Hoshi <hoshi@google.com> am 5985ed7d: am b58c8f50: am 112ceb89: am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume.

* commit '5985ed7d1384bdf3c9aeac2986895961d2ea14e9':
5b0ffac4722de7f8f7a593d67bbab130171ba297 15-Sep-2015 Unsuk Jung <unsuk@google.com> am e8a9f3ba: am b2a902f8: am 347aaca8: am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev

* commit 'e8a9f3ba61f1c1d83f16d0a0fd69c835d6cb854f':
5985ed7d1384bdf3c9aeac2986895961d2ea14e9 15-Sep-2015 Takayuki Hoshi <hoshi@google.com> am b58c8f50: am 112ceb89: am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume.

* commit 'b58c8f50104893354802e8217cfdd35a4cd75225':
e8a9f3ba61f1c1d83f16d0a0fd69c835d6cb854f 15-Sep-2015 Unsuk Jung <unsuk@google.com> am b2a902f8: am 347aaca8: am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev

* commit 'b2a902f80ca50495885741a3fc386dbffee15876':
b58c8f50104893354802e8217cfdd35a4cd75225 15-Sep-2015 Takayuki Hoshi <hoshi@google.com> am 112ceb89: am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume.

* commit '112ceb89435c551704a4b5923f40a048015272a5':
b2a902f80ca50495885741a3fc386dbffee15876 15-Sep-2015 Unsuk Jung <unsuk@google.com> am 347aaca8: am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev

* commit '347aaca87c2fa4ea2e14af355893ead8fbfbe253':
7c4efe55dca23f8215232138bb7b8c835948a921 15-Sep-2015 Phil Burk <philburk@google.com> am bc2f673a: am 21a35da1: am 246ea053: am 90da1f85: am b79b6d40: Merge "JetPlayerTest: cleanup JetPlayer test" into mnc-dev

* commit 'bc2f673a9676f7a92574d5a2fd44bb81b48053a0':
JetPlayerTest: cleanup JetPlayer test
b79b6d401911c8f52061c31106cf60c06f13d972 15-Sep-2015 Phil Burk <philburk@google.com> Merge "JetPlayerTest: cleanup JetPlayer test" into mnc-dev
a21c69a88347e5f048c47198a5512dad5a4be387 15-Sep-2015 Daniel Xie <dxie@google.com> am 18640baa: Merge "Select common codecs for MediaCodecTest.testException" into lmp-sprout-dev

* commit '18640baa493eed77a7426039c2c2cdbc898cf74e':
Select common codecs for MediaCodecTest.testException
cfa68d6809c11c323bae2c7d3679f7ebe8a4c7b4 14-Sep-2015 Marco Nelissen <marcone@google.com> am 49d3488a: am de6e5234: am fedff466: am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev

* commit '49d3488a04dec6954506c6530b74c5fa4d4c0d31':
Remove corrupt test file
49d3488a04dec6954506c6530b74c5fa4d4c0d31 14-Sep-2015 Marco Nelissen <marcone@google.com> am de6e5234: am fedff466: am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev

* commit 'de6e5234216982bd0f1ae452f2d90df3f3021e90':
Remove corrupt test file
de6e5234216982bd0f1ae452f2d90df3f3021e90 14-Sep-2015 Marco Nelissen <marcone@google.com> am fedff466: am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev

* commit 'fedff466f077e264eca5a2b28f352e4335968cb4':
Remove corrupt test file
704e20908b80def4dcb9c62b6cac100c17e6bff9 14-Sep-2015 Phil Burk <philburk@google.com> JetPlayerTest: cleanup JetPlayer test

Eliminate failures caused by not closing the file on the previous test.
Fail immediately when a file cannot be loaded.

There have been intermittent failures in this test.
These changes may help us track down the cause.

Bug: 23161123
Change-Id: If1ba46c6bf02f190fcaf4315a72e54172ea5ce02
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/JetPlayerTest.java
7e8bbb26c191ab220389d19710c21bfc39be8825 12-Sep-2015 Robert Shih <robertshih@google.com> am 60c9eecd: am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow

* commit '60c9eecd3767677c12cd08e9029ff1c767603c4d':
Add 5-second timeout to testFlacHeapOverflow
60c9eecd3767677c12cd08e9029ff1c767603c4d 12-Sep-2015 Robert Shih <robertshih@google.com> am 04915882: am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow

* commit '04915882a8b303a828971d6c09e813c54d037ea9':
Add 5-second timeout to testFlacHeapOverflow
18c71c7582e50bb77e0fa69c4e90d8786f5dbd34 12-Sep-2015 Daniel Xie <dxie@google.com> am 02e5e1a9: am 5c11bdb7: am 9b69b2c5: am 7a3bd4b1: am 73c024cb: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev

* commit '02e5e1a93c41d15c088daaa214ff9081a22a80f9':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
1bf19cd2971fc4dfd4d0e2f30cee3f52b9f2ae84 12-Sep-2015 Unsuk Jung <unsuk@google.com> am b57d1324: resolved conflicts for 5d2795d5 to lmp-dev

* commit 'b57d132462ef6cbd4583d507c7763433a038e296':
Revert "Fix AudioTrackTest.testGetTimestamp"
f35d33d6d5dd36fb004322d44ea67a5cc76dbdc8 12-Sep-2015 Daniel Xie <dxie@google.com> am a3aca4a3: am 358d45e3: am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev

* commit 'a3aca4a3308efc20d53565aa3158795b77c194ae':
Modified testRecorderCamera() to get camera supported resolution for testing.
4f9eaee93516e0ae8b91dfbd59d4c69f334395c0 12-Sep-2015 Yin-Chia Yeh <yinchiayeh@google.com> am 86f8b07b: am fbd2753f: resolved conflicts for a8ab57fe to klp-modular-dev

* commit '86f8b07b4b7d7c040368fd622db442b9d624d870':
Revert "Check for microphone feature in video camera recording tests."
f2ec62867338d34d71e2f8b6b47793f9cbdefbf6 12-Sep-2015 Unsuk Jung <unsuk@google.com> am 2f505efc: am 0a0bec55: resolved conflicts for 1168206d to klp-modular-dev

* commit '2f505efce02fdb19881603a56cf4544ea10eacd0':
Check for microphone feature in video camera recording tests.
2a1d1a925479184574cdf8cac28c2cb2229b1cb5 12-Sep-2015 Daniel Xie <dxie@google.com> am 79b8a7a5: am 42a968d3: am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev

* commit '79b8a7a5f60854c5185966002eb390cf773f1456':
DEV HACK: cts: increase permitted colour delta
1a5711976652603d2b1964be651facaffdac2b9b 12-Sep-2015 Unsuk Jung <unsuk@google.com> am 25a380e3: resolved conflicts for 5bc69858 to lmp-dev

* commit '25a380e39decb17e1d360e6225cc6510d9f88cb7':
Use Supported Camera resolution.
d3063af9b2f7bfb20cf6faa68268f812f955177d 12-Sep-2015 Unsuk Jung <unsuk@google.com> am fd868af7: Merge "resolved conflicts for 90647f20 to lmp-dev" into lmp-dev

* commit 'fd868af70ecca99d8840b5c43492cb8425c2ad44':
Skip encoding tests for unsupported resolutions.
112ceb89435c551704a4b5923f40a048015272a5 12-Sep-2015 Takayuki Hoshi <hoshi@google.com> am 27228e75: am aa059250: (-s ours) DO NOT MERGE: Fix AudioManagerTest#testVolume.

* commit '27228e75f9df739ddf8d561cb9f293b7389f4fd6':
347aaca87c2fa4ea2e14af355893ead8fbfbe253 12-Sep-2015 Unsuk Jung <unsuk@google.com> am 90d356d9: am 731c791e: (-s ours) Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev

* commit '90d356d96117df4463bc37669b46d613deb35048':
54005969862e8bdba5a56317236cee5b2bf92733 12-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 542c2844: media: update vp9 360p test clip with tile columns and frame parallel mode turned on.

* commit '542c2844885ad6157e8ee40d15f448f984704ce2':
media: update vp9 360p test clip with tile columns and frame parallel mode turned on.
3a86d93f11b0ecc3fcc59752b810c12112314fde 12-Sep-2015 Unsuk Jung <unsuk@google.com> am 7fc44c34: Merge "update EncoderVirtualDisplayTest to use very long i-frame interval." into lmp-sprout-dev

* commit '7fc44c344dc0b461d76f6a49047c1cd93f671c21':
update EncoderVirtualDisplayTest to use very long i-frame interval.
894683c522314fbdc31d52e766a949c6f2e56027 12-Sep-2015 Daniel Xie <dxie@google.com> am f4d8853c: am f45a7cc6: am 45004cb7: am 9ce0873c: am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev

* commit 'f4d8853cb4c1402af16f908e2eee3ef13cbaf1a9':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
4f17c9efa3c654d30d7137646de4b4de966dff65 12-Sep-2015 Daniel Xie <dxie@google.com> am a66f06e2: am fa71ec25: am f1ba62b4: am ef1481dc: am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev

* commit 'a66f06e27247b821658d82b82abe95f4ffb87c5c':
improve TestVirtualDisplayRecycles to reduce memory usage
fedff466f077e264eca5a2b28f352e4335968cb4 12-Sep-2015 Marco Nelissen <marcone@google.com> am 21cc5c21: Merge "Remove corrupt test file" into lmp-dev

* commit '21cc5c21ea483f97d3103eb05dd7bbf5249e87d5':
Remove corrupt test file
02e5e1a93c41d15c088daaa214ff9081a22a80f9 12-Sep-2015 Daniel Xie <dxie@google.com> am 5c11bdb7: am 9b69b2c5: am 7a3bd4b1: am 73c024cb: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev

* commit '5c11bdb75a200b98c9139fe5272089993899a4d1':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
b57d132462ef6cbd4583d507c7763433a038e296 12-Sep-2015 Unsuk Jung <unsuk@google.com> resolved conflicts for 5d2795d5 to lmp-dev

Change-Id: Ie2c7c8891b3d6abf76d1482878a5bd6f6bbbbc5b
7fe03a284b4813737c5032765354ead24883f0af 12-Sep-2015 Robert Shih <robertshih@google.com> am 08a48353: am bea1742c: am 429298f7: am 6b45af4a: am 2297d818: am c51dd8f0: am d6ddd0ca: am ca747519: Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev

* commit '08a48353501c6763991ccf019f8499dd4bfca122':
Add 5-second timeout to testFlacHeapOverflow
7594bb1f1c29a713c6c85c83e91bc87d773be87a 12-Aug-2015 Chong Zhang <chz@google.com> cts: get video size from CamcorderProfile -- DO NOT MERGE

bug: 23036810
bug: 23972679
Change-Id: I35524cc92f6e1ee7d1df2d62d044595438048ac7
rc/android/media/cts/MediaRecorderTest.java
2297d818b0f11cdbf22af5bda15d02646334df29 11-Sep-2015 Robert Shih <robertshih@google.com> am c51dd8f0: am d6ddd0ca: am ca747519: Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev

* commit 'c51dd8f0b91469bc4bb0701ca9aa397818ea311e':
Add 5-second timeout to testFlacHeapOverflow
c51dd8f0b91469bc4bb0701ca9aa397818ea311e 11-Sep-2015 Robert Shih <robertshih@google.com> am d6ddd0ca: am ca747519: Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev

* commit 'd6ddd0ca41196cfb1e9509b2f63d834751210f64':
Add 5-second timeout to testFlacHeapOverflow
d6ddd0ca41196cfb1e9509b2f63d834751210f64 11-Sep-2015 Robert Shih <robertshih@google.com> am ca747519: Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev

* commit 'ca747519dcd409e5284c3da3207e9c594919ead2':
Add 5-second timeout to testFlacHeapOverflow
ca747519dcd409e5284c3da3207e9c594919ead2 11-Sep-2015 Robert Shih <robertshih@google.com> Merge "Add 5-second timeout to testFlacHeapOverflow" into lmp-mr1-dev
403a46bcf58b565069bfd6563bd70951369223dc 11-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 40115d86: am a96d6ff4: am b5f8c3ba: am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev

* commit '40115d8608106708f6959fb8401f7b31112513e6':
40115d8608106708f6959fb8401f7b31112513e6 11-Sep-2015 Ronghua Wu <ronghuawu@google.com> am a96d6ff4: am b5f8c3ba: am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev

* commit 'a96d6ff42b197a891019a12d5d065dd5ad144aef':
a96d6ff42b197a891019a12d5d065dd5ad144aef 11-Sep-2015 Ronghua Wu <ronghuawu@google.com> am b5f8c3ba: am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev

* commit 'b5f8c3bac66dffb281b8a4da7cfa9e077c987842':
b5f8c3bac66dffb281b8a4da7cfa9e077c987842 11-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 0f92e27b: am b732a7a8: (-s ours) Merge "DO NOT MERGE: media: fix 4k hevc test stream" into lmp-sprout-dev

* commit '0f92e27b86b32ea1b8c2149aabd7ae213f97b50d':
04915882a8b303a828971d6c09e813c54d037ea9 11-Sep-2015 Robert Shih <robertshih@google.com> am 56e775b7: am 6e622718: Add 5-second timeout to testFlacHeapOverflow

* commit '56e775b7191be15893b49facbfe309ed8128a606':
Add 5-second timeout to testFlacHeapOverflow
9141ba5649a27487e6ca6b16e15b3093f7f82a0f 11-Sep-2015 Robert Shih <robertshih@google.com> Add 5-second timeout to testFlacHeapOverflow

Bug: 23793209
Change-Id: If82a2094a1269805d0babdb393f2976052ed73d2
rc/android/media/cts/MediaPlayerTest.java
6e622718594a0d092d2118630859721bf5df595d 11-Sep-2015 Robert Shih <robertshih@google.com> Add 5-second timeout to testFlacHeapOverflow

Bug: 23793209
Change-Id: If82a2094a1269805d0babdb393f2976052ed73d2
rc/android/media/cts/MediaPlayerTest.java
a3aca4a3308efc20d53565aa3158795b77c194ae 10-Sep-2015 Daniel Xie <dxie@google.com> am 358d45e3: am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev

* commit '358d45e35803543f392e7beab47fff3384d7b473':
Modified testRecorderCamera() to get camera supported resolution for testing.
86f8b07b4b7d7c040368fd622db442b9d624d870 10-Sep-2015 Yin-Chia Yeh <yinchiayeh@google.com> am fbd2753f: resolved conflicts for a8ab57fe to klp-modular-dev

* commit 'fbd2753f18a9e7e76694b26da4a1088713edbd80':
Revert "Check for microphone feature in video camera recording tests."
2f505efce02fdb19881603a56cf4544ea10eacd0 10-Sep-2015 Unsuk Jung <unsuk@google.com> am 0a0bec55: resolved conflicts for 1168206d to klp-modular-dev

* commit '0a0bec5589e5c5a35604e3e56f7a95235d02e7d1':
Check for microphone feature in video camera recording tests.
79b8a7a5f60854c5185966002eb390cf773f1456 10-Sep-2015 Daniel Xie <dxie@google.com> am 42a968d3: am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev

* commit '42a968d33292f931eaf9ff7c1bfa371858cfc1bf':
DEV HACK: cts: increase permitted colour delta
5c11bdb75a200b98c9139fe5272089993899a4d1 10-Sep-2015 Daniel Xie <dxie@google.com> am 9b69b2c5: am 7a3bd4b1: am 73c024cb: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev

* commit '9b69b2c5bc1d3970391546387c8921ad75240ecb':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
c386fe2e809556400b7fc3e7b90e06541200cdd7 10-Sep-2015 Daniel Xie <dxie@google.com> am 12c7def0: am 17746089: am 61f6182b: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev

* commit '12c7def0545fa5fa15e9d43b6277a0ca2dc615d0':
Fix AudioTrackTest.testGetTimestamp
5d2795d583d1db408e4c1efb21931bf0a8299c85 10-Sep-2015 Daniel Xie <dxie@google.com> am dac290d5: am 7e6de2f2: am c59abe4b: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev

* commit 'dac290d505f2b164956371c5a6353c8715b78251':
Revert "Fix AudioTrackTest.testGetTimestamp"
0c3fb21fd58a226b0b45fca0777de4e9a5733d7d 10-Sep-2015 Daniel Xie <dxie@google.com> am 9cd2cdb4: am 022864a1: am aea6a23f: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev

* commit '9cd2cdb40dedcd0928aff545c8d95b5536a8c2c6':
Fix AudioTrackTest.testGetTimestamp
dc43e0e6737e15b8dc1d15bb570944f7f002c4e4 10-Sep-2015 Daniel Xie <dxie@google.com> am d590f90c: am d38598c1: am dcf21f46: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev

* commit 'd590f90cf1b1de5805657a704f09b87f690cae0d':
increase wait timeout and reduce dequeue buffer time-out
358d45e35803543f392e7beab47fff3384d7b473 10-Sep-2015 Daniel Xie <dxie@google.com> am c2ad0fb7: am 6903fb53: am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev

* commit 'c2ad0fb7bdcd0b8cfbe72b527491084b161f8493':
Modified testRecorderCamera() to get camera supported resolution for testing.
25a380e39decb17e1d360e6225cc6510d9f88cb7 10-Sep-2015 Unsuk Jung <unsuk@google.com> resolved conflicts for 5bc69858 to lmp-dev

Change-Id: I28e757bc8350f69bea98691fc0e9641a76e8ec15
fbd2753f18a9e7e76694b26da4a1088713edbd80 10-Sep-2015 Yin-Chia Yeh <yinchiayeh@google.com> resolved conflicts for a8ab57fe to klp-modular-dev

Change-Id: I04089331c362d038b49fa167685296646d23b7c3
fd868af70ecca99d8840b5c43492cb8425c2ad44 10-Sep-2015 Unsuk Jung <unsuk@google.com> Merge "resolved conflicts for 90647f20 to lmp-dev" into lmp-dev
9df43f095a805228046106384bebb6360fbcf6ab 10-Sep-2015 Jesse Hall <jessehall@google.com> am 6b2811eb: Merge "PresentationSyncTest: disable faster-than-refresh case" into lmp-sprout-dev

* commit '6b2811ebe7b817e1a2637f7ef3a3c3803abf8591':
PresentationSyncTest: disable faster-than-refresh case
5de4691954e3a9b86e854d34744e42c7e7ec9bd0 10-Sep-2015 Zhijun He <zhijunhe@google.com> am 0b355c80: CamcorderProfileTest: fix the last timelapse id value

* commit '0b355c803aa72646f64b521fd45ae872a52b54da':
CamcorderProfileTest: fix the last timelapse id value
a7c029f23ec6554221269522c785a7012319ccee 10-Sep-2015 Ronghua Wu <ronghuawu@google.com> am f024450f: media: release decoder explicitly instead of relying on GC.

* commit 'f024450f79315c6e6605e6b6552e5899c55a832b':
media: release decoder explicitly instead of relying on GC.
7a9b79f616266bd4e7d414cd9c0a3bf3830e2531 10-Sep-2015 Unsuk Jung <unsuk@google.com> resolved conflicts for 90647f20 to lmp-dev

Change-Id: I51c1d8e4ea44df2029495fecba55e144f21c877b
0a0bec5589e5c5a35604e3e56f7a95235d02e7d1 10-Sep-2015 Unsuk Jung <unsuk@google.com> resolved conflicts for 1168206d to klp-modular-dev

Change-Id: Ieee95a425a86791ee59b4d3d3a8ef938768b9b70
f4d8853cb4c1402af16f908e2eee3ef13cbaf1a9 10-Sep-2015 Daniel Xie <dxie@google.com> am f45a7cc6: am 45004cb7: am 9ce0873c: am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev

* commit 'f45a7cc6234b3a6c0d65fea4deff34389e3ea674':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
a66f06e27247b821658d82b82abe95f4ffb87c5c 10-Sep-2015 Daniel Xie <dxie@google.com> am fa71ec25: am f1ba62b4: am ef1481dc: am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev

* commit 'fa71ec25a3acc09414db51f775f1eae15f79b263':
improve TestVirtualDisplayRecycles to reduce memory usage
42a968d33292f931eaf9ff7c1bfa371858cfc1bf 10-Sep-2015 Daniel Xie <dxie@google.com> am 0e3b22b3: am d460a355: am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev

* commit '0e3b22b3e1edb3784af3f5d3e968af9d0f9f424e':
DEV HACK: cts: increase permitted colour delta
5bc698583e62d613e27bfea0d5ba0fec051839ca 10-Sep-2015 Daniel Xie <dxie@google.com> am 3cac2cc7: am 3b7a3299: am 628c43ab: Merge "Use Supported Camera resolution." into kitkat-cts-dev

* commit '3cac2cc7653821db1e37d288d913876ac669d3c9':
Use Supported Camera resolution.
90647f2044012bbcf24cc1fcb3662b8ba53d7f8e 10-Sep-2015 Daniel Xie <dxie@google.com> am b98c265b: am e6e09fd3: am f34f3767: Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev

* commit 'b98c265bc8f1aefa21539bf99eb579538d756dd6':
Skip encoding tests for unsupported resolutions.
f45a7cc6234b3a6c0d65fea4deff34389e3ea674 10-Sep-2015 Daniel Xie <dxie@google.com> am 45004cb7: am 9ce0873c: am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev

* commit '45004cb75491a6f5b484df80980a5a03a23a9d06':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
fa71ec25a3acc09414db51f775f1eae15f79b263 10-Sep-2015 Daniel Xie <dxie@google.com> am f1ba62b4: am ef1481dc: am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev

* commit 'f1ba62b4873854fedef5c138ad87bdfc15fd20cc':
improve TestVirtualDisplayRecycles to reduce memory usage
e60627160527e417f1bec2751dc38c79e1948b10 10-Sep-2015 Jungyee Yoo <jungyee.yoo@lge.com> am fd0e218a: am 391a9715: am a6b1e102: Merge "Chage the timeout while rendering to overcome the low performance device." into kitkat-cts-dev

* commit 'fd0e218a3a6208890a170b617f99fbea785e46d0':
Chage the timeout while rendering to overcome the low performance device.
1a10a24edb45ea978fd60e7fe12597aa8d35dc89 05-Sep-2015 Marco Nelissen <marcone@google.com> Expand timed text test

Check that we also receive the correct global info

Change-Id: I60cb5445747544cb53b6a3248c461106ff255f35
rc/android/media/cts/MediaPlayerTest.java
7a3bd4b13a7e3b80225448d3155245a748456899 04-Sep-2015 Daniel Xie <dxie@google.com> am 73c024cb: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev

* commit '73c024cb70e74a20e75bc04ea1a7b85256505329':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
17746089f9980a51d77384c020e1c2ba1cd7f8bf 04-Sep-2015 Daniel Xie <dxie@google.com> am 61f6182b: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev

* commit '61f6182bac5ab8580edde748d6944818c73fa382':
Fix AudioTrackTest.testGetTimestamp
7e6de2f2353763429af09e1c02bd1509332afc33 04-Sep-2015 Daniel Xie <dxie@google.com> am c59abe4b: Merge "Revert "Fix AudioTrackTest.testGetTimestamp"" into kitkat-cts-dev

* commit 'c59abe4b38aa4d3dfe7f45ffefd0470d8825c009':
Revert "Fix AudioTrackTest.testGetTimestamp"
022864a131c58302a12282b3965d17d956e0473e 04-Sep-2015 Daniel Xie <dxie@google.com> am aea6a23f: Merge "Fix AudioTrackTest.testGetTimestamp" into kitkat-cts-dev

* commit 'aea6a23f121777190e5c8fa0b9a34ca7b2197188':
Fix AudioTrackTest.testGetTimestamp
d38598c1033d17dde038627835ad079a5bcca7b3 04-Sep-2015 Daniel Xie <dxie@google.com> am dcf21f46: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev

* commit 'dcf21f46b4fbb9b373d43b5284c629e6a33df5ef':
increase wait timeout and reduce dequeue buffer time-out
6903fb53b5b025875bc3e925ce67460da987cff3 04-Sep-2015 Daniel Xie <dxie@google.com> am 52a2733a: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev

* commit '52a2733a605dfbf48ccd5cb34903a00ce3d5e71a':
Modified testRecorderCamera() to get camera supported resolution for testing.
c83fe6744821fba862ed80499e03108009e1f4c3 04-Sep-2015 Daniel Xie <dxie@google.com> am d84cacbd: Merge "Handling NPE in case of AVC level under 2" into kitkat-cts-dev

* commit 'd84cacbdf2ab013ecbedd6788a558d65ccb45d5a':
Handling NPE in case of AVC level under 2
064c1624cb5b951d30eedc2fa33345d027c0f221 04-Sep-2015 Yin-Chia Yeh <yinchiayeh@google.com> am 1f6e28cc: Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev

* commit '1f6e28cce75d5b5053419d04becb284f0656c668':
Revert "Check for microphone feature in video camera recording tests."
817428167d67de18a83329660f825a23d8cc8652 04-Sep-2015 Daniel Xie <dxie@google.com> am 72893be8: Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev

* commit '72893be85e17b0047728902cef1bfaf4fd75ac32':
Check for microphone feature in video camera recording tests.
d460a35588826a84ceb8ca6b06b42c038baac9a4 04-Sep-2015 Daniel Xie <dxie@google.com> am 52948ac4: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev

* commit '52948ac477b0f9cd0d52d91a6105b4d554426f83':
DEV HACK: cts: increase permitted colour delta
3b7a3299346bb1af39acd9638d151ba407b99c2d 04-Sep-2015 Daniel Xie <dxie@google.com> am 628c43ab: Merge "Use Supported Camera resolution." into kitkat-cts-dev

* commit '628c43ab55a86fe9c7e77eb6fa33cedce80a94d4':
Use Supported Camera resolution.
e6e09fd3e725290234dda7a4e51c5bdba03eeb6b 04-Sep-2015 Daniel Xie <dxie@google.com> am f34f3767: Merge "Skip encoding tests for unsupported resolutions." into kitkat-cts-dev

* commit 'f34f3767c43a7829b14da1267ff5fcbb03f9d617':
Skip encoding tests for unsupported resolutions.
9ce0873c64711e5010bc569937f13a8a78f0d694 04-Sep-2015 Daniel Xie <dxie@google.com> am 4d7e03fc: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev

* commit '4d7e03fcaa198962cb50969dc7c05797e3ed2195':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
ef1481dcbca70c53f345fa781f9021ac8eeb14e6 04-Sep-2015 Daniel Xie <dxie@google.com> am ba39064d: Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev

* commit 'ba39064dd7b3a60cefd1998bf0cff706ce5ef825':
improve TestVirtualDisplayRecycles to reduce memory usage
391a97159bc4173ebdfed9d6a65d1886a94968d2 04-Sep-2015 Jungyee Yoo <jungyee.yoo@lge.com> am a6b1e102: Merge "Chage the timeout while rendering to overcome the low performance device." into kitkat-cts-dev

* commit 'a6b1e102127d1b0b893570976c50e5e0914fc9ca':
Chage the timeout while rendering to overcome the low performance device.
39861bb314ca249a0c244f53a06c1dd9064813ca 04-Sep-2015 Daniel Xie <dxie@google.com> am 37f4b540: Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev automerge: a00f78c

* commit '37f4b54072f3cb44d87356c1c0f8c9d55658a081':
Fix for failing test of testEOS because checksum takes too long
73575de497b9f61f1e06a467fd93490c1332bea3 11-Jun-2015 Marco Nelissen <marcone@google.com> Remove corrupt test file

One of the CTS test files was technically corrupt, and we're more
strict now so this file wasn't passing CTS anymore.

Bug: 18386956
Bug: 18872896
Bug: 21208259
Change-Id: Ie6d699649658a61692ce2ea7c2d7bc9d64668d59
(cherry picked from commit e1757df51cc86815f37b4a68ad25a60ea23d1b44)
es/raw/gb18030_5.mp3
rc/android/media/cts/MediaScannerTest.java
8407a6ffff17caddeac201db4898a71829e6a0dd 04-Sep-2015 Ronghua Wu <ronghuawu@google.com> am 827a895c: media: fix vp9 decode test stream

* commit '827a895c71c456354fc232f2e6e5fe6bb2e024b6':
media: fix vp9 decode test stream
05fe3848d9c716a7326ea1f344c1f87ccf2190cf 04-Sep-2015 Lajos Molnar <lajos@google.com> am df1c6d45: media: don\'t test video decoders & encoders on watch devices

* commit 'df1c6d45f64d6f7b33a84bc1b089754cdbeaa4d2':
media: don't test video decoders & encoders on watch devices
c26640b072a2c978910f796e437a316e5f835e2b 04-Sep-2015 Lajos Molnar <lajos@google.com> am 075ea8aa: Merge "media: change vorbis samples to 48kHz" into lmp-sprout-dev

* commit '075ea8aae48ff751c27d6f99f27324276d39f9b5':
media: change vorbis samples to 48kHz
3cbd483fb89c4a402ffcf87e8c73d4598f2843f4 04-Sep-2015 Lajos Molnar <lajos@google.com> am f518d4e9: Merge "media: run media tests based on device type and support" into lmp-sprout-dev

* commit 'f518d4e9f71aac4f95539dfa20a694f0c2629e5f':
media: run media tests based on device type and support
3401d00933d7fb23fc1e383ee5ba668e7338c605 04-Sep-2015 Daniel Cardenas <danielcar@google.com> am 6905206a: Fix AudioManagerTest to handle TVs that don\'t vibrate and lack ringer functionality.

* commit '6905206a302361743545fb6464efc51fdffcc2aa':
Fix AudioManagerTest to handle TVs that don't vibrate and lack ringer functionality.
333b361c5fec5da2341ca2a2c59c4cb7c8e474d9 04-Sep-2015 Lajos Molnar <lajos@google.com> am 380a0c49: Merge changes I5ffb1399,I2333765e,I64ca4e29,I6f393150 into lmp-sprout-dev

* commit '380a0c49847776707abc578cf9883441b898a00c':
media: centralize signaling of skipped tests
media: update MediaCodecList handling to API 21
cts: add tests to validate decoding profiles defined by CDD.
cts: validate h264 and h265 codec profiles and level requirements.
0673e041a2c59b00377a5cb6775e2423b2b4e66e 04-Sep-2015 Jason Parks <jparks@google.com> am 78394957: Merge "Fix MediaRecorderTest to test for encoders." into lmp-sprout-dev

* commit '783949572cf0dfc04020da85a66da64c072504f1':
Fix MediaRecorderTest to test for encoders.
d6e289dbd89a58fb98e031d1719ec5e48328b428 04-Sep-2015 Jason Parks <jparks@google.com> am b72cdbdc: Merge "Fix MediaRecorderTest failures." into lmp-sprout-dev

* commit 'b72cdbdc8cbd3c146ac62e0c6831adba656681e5':
Fix MediaRecorderTest failures.
1cc2c69281b367378287f711fbd8264bc31b479d 04-Sep-2015 Jason Parks <jparks@google.com> am aea823b0: Fix failure in testMuxer().

* commit 'aea823b0eb88a585e66019202945316a33a8934c':
Fix failure in testMuxer().
a788976c996dd7dacd119a5b5dd6035784394dee 04-Sep-2015 Jason Parks <jparks@google.com> am f912a16f: Test for the codecs in the MediaPlayerFlakyNetworkTests.

* commit 'f912a16fd93286779b00775867be346a854fb130':
Test for the codecs in the MediaPlayerFlakyNetworkTests.
80360dc4ef2fc60678b98829e9a82f8d5a0afb72 04-Sep-2015 Jason Parks <jparks@google.com> am e6ad305e: Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev

* commit 'e6ad305e8da121f44680a67e0e3dc7cb76f9d2b5':
Skip ImageReaderDecoderTest if h.264 is not found.
57e5c0da39872411278005631d1a6993166ba513 04-Sep-2015 Jason Parks <jparks@google.com> am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev

* commit '8a893be3f8c00e65a4c45c9615b3f6b547579cd5':
Fix failing CTS tests.
16e8e01f7a38995d5a1851c8bf04b133cc6efe92 04-Sep-2015 Zhijun He <zhijunhe@google.com> am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev

* commit '9610d4a348e51e16c5c61c216b6afde6df0e5bb3':
CamcorderProfile: guard unknown profile qualities
e9cf4cb58ee7bbded3589369bcab847b35f3ec8c 04-Sep-2015 Jason Parks <jparks@google.com> am 74b936fb: Fix failing CTS tests.

* commit '74b936fbc59f81f296f5c6a3453c29785f9913ac':
Fix failing CTS tests.
c2c7420c449b2e6bcbb90a7acd8a3b0ad932d482 03-Sep-2015 Jason Parks <jparks@google.com> am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev

* commit '336efd3166534cb44ad2be876ba7f8ea30db65c7':
Fix various Wear media CTS failures.
7f20f7d6da402381f9908ee5b5f7d8ef9ef65adc 03-Sep-2015 Jason Parks <jparks@google.com> am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output.

* commit '1b16d5ced284c1341c6bf3003f39027083053e30':
Don’t run RingtoneMangerTest tests on devices without audio output.
436acb713903fdd9eeaad927b25540feefbf6e26 03-Sep-2015 Jason Parks <jparks@google.com> am f9e09d47: Don’t run Ringtone test if the devices without audio output.

* commit 'f9e09d47fe391b35e032ba150e4cb1c177f491b9':
Don’t run Ringtone test if the devices without audio output.
0a64b753619b6b8882313b16fb77af7054109dd9 03-Sep-2015 Unsuk Jung <unsuk@google.com> am ac96906d: am b009c27d: am 02ba8bf7: am d9c1aa0b: am a493eadb: Merge "Test for playback position at end of playback" into mnc-dev

* commit 'ac96906dd4935e4802a8fbb50a0face1e46b9c27':
Test for playback position at end of playback
843584a6db721b8228208183018acfda02149eea 03-Sep-2015 Jason Parks <jparks@google.com> am 0bd09f25: Don’t require the codec for devices without audio output.

* commit '0bd09f2560a3050311e773294c61f84cfc929952':
Don’t require the codec for devices without audio output.
fdfa912d3775b5f1e5fb62943f13c57813b2f216 03-Sep-2015 Jason Parks <jparks@google.com> am 10a6cebf: Fix MediaCodec tests on devices without codecs.

* commit '10a6cebfb8bc28c747460d80be852f509373cb59':
Fix MediaCodec tests on devices without codecs.
e2d1f179fb76e7823595a8bbd8343aff9dfb9eae 03-Sep-2015 Jason Parks <jparks@google.com> am 62563bc4: Only run the test if the device has audio output.

* commit '62563bc49472a41517fe082616bfe14628b9649b':
Only run the test if the device has audio output.
0ba8304ed7c30a333ffd1feeb10fe7b5c294a83d 03-Sep-2015 Jason Parks <jparks@google.com> am fab65cd6: Don\'t run the test if the codec isn\'t installed.

* commit 'fab65cd60b3d3275a95718ac7eb4d91bf45fa000':
Don't run the test if the codec isn't installed.
0a0d79ca4d312324562bebda1b3fa0df93b0ec26 03-Sep-2015 Jason Parks <jparks@google.com> am f6ad3a23: Only run the test if the device has audio output.

* commit 'f6ad3a2388ff7e925a6c6a9ae0294817e6b5deda':
Only run the test if the device has audio output.
2b4e2a3f366eb73be7e7927ab5b9434b9ad4213f 03-Sep-2015 Jason Parks <jparks@google.com> am 6c42b2c7: Merge "Don’t run video tests on devices that do not have audio output." into lmp-sprout-dev

* commit '6c42b2c7033f6fe3b264b37be61f52177e7fe814':
Don’t run video tests on devices that do not have audio output.
a493eadba9b21a9966a02ef3c26c9a1eea418631 03-Sep-2015 Unsuk Jung <unsuk@google.com> Merge "Test for playback position at end of playback" into mnc-dev
2c4106ae8719f4ae83154ce84e8543c2315452ff 28-Aug-2015 Henry Jian <hzjian@google.com> Merge "migrate CtsMediaTest to CTS_V2 and use Dynamic Config to get youtube url"
f2fa1e16bf988183e8b19b827b21b080a8a2ea39 28-Aug-2015 Robert Shih <robertshih@google.com> am 2aa0b684: am 913c472b: Merge "DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests" into lmp-mr1-dev

* commit '2aa0b6847c24777adee25c9c81211b19fb155aaf':
DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests
2aa0b6847c24777adee25c9c81211b19fb155aaf 28-Aug-2015 Robert Shih <robertshih@google.com> am 913c472b: Merge "DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests" into lmp-mr1-dev

* commit '913c472ba3d6ed23f0248fa672326f0d5b50e15a':
DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests
913c472ba3d6ed23f0248fa672326f0d5b50e15a 28-Aug-2015 Robert Shih <robertshih@google.com> Merge "DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests" into lmp-mr1-dev
e7263d9fb5daea5220812002a7e6c0a9dd0fc3a1 28-Aug-2015 Robert Shih <robertshih@google.com> am 298a8883: am ae6ebb55: am e10b49ae: am 4856c8c7: am 28619fd8: am 3bde3d04: am 671389ab: am 77b96a8b: am 750d796e: am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit '298a888347b913519edc4c989c21901c511ed9df':
test if libFLAC is patched against CVE-2014-9028
28619fd80b5af1198db23ae7b5f504e6340a3046 28-Aug-2015 Robert Shih <robertshih@google.com> am 3bde3d04: am 671389ab: am 77b96a8b: am 750d796e: am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit '3bde3d04eb11f109bef136aa762eb522168d062e':
test if libFLAC is patched against CVE-2014-9028
3bde3d04eb11f109bef136aa762eb522168d062e 28-Aug-2015 Robert Shih <robertshih@google.com> am 671389ab: am 77b96a8b: am 750d796e: am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit '671389ab3dd79aae7532ce75976020109e79888d':
test if libFLAC is patched against CVE-2014-9028
671389ab3dd79aae7532ce75976020109e79888d 28-Aug-2015 Robert Shih <robertshih@google.com> am 77b96a8b: am 750d796e: am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit '77b96a8bf10511f3369f4b22904d5750eedafba9':
test if libFLAC is patched against CVE-2014-9028
77b96a8bf10511f3369f4b22904d5750eedafba9 28-Aug-2015 Robert Shih <robertshih@google.com> am 750d796e: am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit '750d796ef0323d80bc55597ce5523e5170aff846':
test if libFLAC is patched against CVE-2014-9028
750d796ef0323d80bc55597ce5523e5170aff846 28-Aug-2015 Robert Shih <robertshih@google.com> am 11899360: am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit '11899360f1d7bfdfc2173270b0ddf56db9140b18':
test if libFLAC is patched against CVE-2014-9028
11899360f1d7bfdfc2173270b0ddf56db9140b18 28-Aug-2015 Robert Shih <robertshih@google.com> am 46f2b208: am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit '46f2b208bf1645bea1f3d39abde27ecb3fb13bfc':
test if libFLAC is patched against CVE-2014-9028
46f2b208bf1645bea1f3d39abde27ecb3fb13bfc 28-Aug-2015 Robert Shih <robertshih@google.com> am c8eebea2: am 860440a4: test if libFLAC is patched against CVE-2014-9028

* commit 'c8eebea28e350db97b1b334758e6538226085550':
test if libFLAC is patched against CVE-2014-9028
2add0161f47e966d0726e876223ef2aa1f9ae177 27-Aug-2015 Henry Jian <hzjian@google.com> migrate CtsMediaTest to CTS_V2 and use Dynamic Config to get youtube url

Change-Id: Idc178252e5dedf0f8c25b9333898702db5d9de07
ndroid.mk
ndroidTest.xml
ynamicConfig.xml
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
860440a400ff26315049d886b61ba01d80e97754 26-Aug-2015 Robert Shih <robertshih@google.com> test if libFLAC is patched against CVE-2014-9028

Overview of CVE-2014-9028:

Heap-based buffer overflow in stream_decoder.c in libFLAC before 1.3.1
allows remote attackers to execute arbitrary code via a crafted .flac
file.

(source: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9028)

heap_oob_flac has a .mp3 extension to avoid compresstion by aapt. When a
resource file is compressed openRawResourceFd would fail. Please refer
to kNoCompressExt in frameworks/base/tools/aapt/Package.cpp for more
details.

Bug: 23238405
Change-Id: I7c13b19beb83c10fced360537a84b2f053ce8a26
es/raw/heap_oob_flac.mp3
rc/android/media/cts/MediaPlayerTest.java
0aba133409a95b1068e36e8a5ebaeafed95a1810 15-Aug-2015 Robert Shih <robertshih@google.com> DO NOT MERGE: Emulate AudioTrack.write(...,timestamp) in CTS tests

Emulate the behavior for `AudioTrack.write(ByteBuffer audioData,
int sizeInBytes,
@WriteMode int writeMode,
long timestamp)`
on L MR1 where AudioTrack.write(...,timestamp) is still unavailable.

This is done by prepending a pts header to each data buffer before
the buffer is submitted through AudioTrack.write.

This commit is a port of f5e62d4adfa5a6bd750bdac279b7467ad0208cf9 on M
(c20af2fde6399c1ebbc938c2a85053e2d7037809 on master), plus two additonal
changes to ensure testTunneledVideoPlayback passes on L MR1:

* reposition audio data ByteBuffer to 0
* use input EOS as output EOS indicator

Bug: 23165343
Change-Id: If39a784ed17f4c57846c58841e5d28d62616889a
rc/android/media/cts/CodecState.java
rc/android/media/cts/NonBlockingAudioTrack.java
18f6aed08826ef604c47ce01dd9f59926e16db6f 19-Aug-2015 Rachad Alao <rachad@google.com> am 791614a0: am 5f6f4cb2: am a7f818a7: am 26614c2a: am 8f03ca38: Merge "Fix android.media.cts.ClearKeySystemTest.testClearKeyPlayback" into mnc-dev

* commit '791614a084d7bfd8d1483ff7f3817cdf842aaeee':
Fix android.media.cts.ClearKeySystemTest.testClearKeyPlayback
6b98c21ed3ce37ac79bbb11c163b2c03e0d1beac 19-Aug-2015 Rachad <rachad@google.com> Fix android.media.cts.ClearKeySystemTest.testClearKeyPlayback

Add missing audioBuffer.clear() to CodecState.java to fix AudioTrack.write() failures.

Bug:23273860
Change-Id: If238142a67b70e7aa6f0680d5b75bb0166e1b5d2
rc/android/media/cts/CodecState.java
a72c91f352724eda42d91957b8935261b912e389 15-Aug-2015 Rachad Alao <rachad@google.com> Merge "DO NOT MERGE: AudioTrack.write(...,timestamp) CTS test" into mnc-dev
d5f8e0a94b48c02cc622eca4ddb494e2c7378282 12-Aug-2015 Chong Zhang <chz@google.com> am ed50e33b: am 65f8294e: am 5d7909f6: am 2bc29e74: am 013f2daf: Merge "cts: get video size from CamcorderProfile" into mnc-dev

* commit 'ed50e33b1137fd9c17a9c21d8de80a8547db13b2':
cts: get video size from CamcorderProfile
013f2daf727155492aca01f326fa2467a9c753a3 12-Aug-2015 Chong Zhang <chz@google.com> Merge "cts: get video size from CamcorderProfile" into mnc-dev
49e10b692d3aa360baeaf7172df7f1ecb12bde26 12-Aug-2015 Chong Zhang <chz@google.com> cts: get video size from CamcorderProfile

bug: 23036810
Change-Id: I35524cc92f6e1ee7d1df2d62d044595438048ac7
rc/android/media/cts/MediaRecorderTest.java
1906cdc276dc8dde5404ec19aa01f56dd8bd702c 12-Aug-2015 Daniel Xie <dxie@google.com> am c9801d45: am c730bd22: am d8eace3c: am 480713cd: am a28a572d: am 1ddbb3ba: am bf6a2a70: am 35944a11: am 46ba1f8b: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev automerge: e791827

* commit 'c9801d4567f38db52c874f635c2bf08cd23eff4d':
Should create a decoder from MediaCodecList
a28a572d8e21f2ed27dc374ec0da018e08956229 12-Aug-2015 Daniel Xie <dxie@google.com> am 1ddbb3ba: am bf6a2a70: am 35944a11: am 46ba1f8b: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev automerge: e791827

* commit '1ddbb3ba343613c722c6049b7a46490ea6c44e39':
Should create a decoder from MediaCodecList
1ddbb3ba343613c722c6049b7a46490ea6c44e39 12-Aug-2015 Daniel Xie <dxie@google.com> am bf6a2a70: am 35944a11: am 46ba1f8b: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev automerge: e791827

* commit 'bf6a2a7057623eae9a6dd2d91e9834ac841ca965':
Should create a decoder from MediaCodecList
bf6a2a7057623eae9a6dd2d91e9834ac841ca965 12-Aug-2015 Daniel Xie <dxie@google.com> am 35944a11: am 46ba1f8b: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev automerge: e791827

* commit '35944a11b9e8a1cbd4ff9799574050896b2a94a4':
Should create a decoder from MediaCodecList
46ba1f8bb4a69426d4321499d8b7a1504420e5a1 12-Aug-2015 Daniel Xie <dxie@google.com> Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev
automerge: e791827

* commit 'e79182776ec0175a2944e182836915c9a572433a':
Should create a decoder from MediaCodecList
e79182776ec0175a2944e182836915c9a572433a 12-Aug-2015 Daniel Xie <dxie@google.com> Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev
ca5947044ae2491bee36e59f311e35024931ef42 11-Aug-2015 Billy Lau <billylau@google.com> am 351fd781: am e1b77538: am eee15c75: am f7e94c33: am c9f9235b: Bug: 22979576 Fix CTS: RingtoneManagerTest failing

* commit '351fd7819e0f7deb6014b329e9775b4482a884e2':
Bug: 22979576 Fix CTS: RingtoneManagerTest failing
c9f9235b6881118891732492145c4030a18ab871 11-Aug-2015 Billy Lau <billylau@google.com> Bug: 22979576 Fix CTS: RingtoneManagerTest failing

Fixed a bug in the implementation of one utility method in Utils.java
which causes the appops permission to not be granted in time.

Change-Id: Ia476d36a21c5ecd74ae0bd4e8411091f51452f27
rc/android/media/cts/Utils.java
a2288991706f11d5b8ab33ea8f46cf84fa8ecd78 11-Aug-2015 Billy Lau <billylau@google.com> am d8bd421b: am b422af0f: am 9cb0e811: am cd87d23f: am f297a2b9: Bug: 23003511 Fix CTS: AudioManagerTest#testSoundEffects failing

* commit 'd8bd421b92e0cbaaafae3f99628569074098f84d':
Bug: 23003511 Fix CTS: AudioManagerTest#testSoundEffects failing
f297a2b94c1e0a4da2673823974ad108d2604429 11-Aug-2015 Billy Lau <billylau@google.com> Bug: 23003511 Fix CTS: AudioManagerTest#testSoundEffects failing

Added calls to enable app ops for write settings to make sure that
cts tests will not fail.

Change-Id: I82d6aeffef34661b8483a9fcb95b699dae9842ec
rc/android/media/cts/AudioManagerTest.java
6014d3f563ab1ef8ef0960465276ec955617d12c 06-Feb-2014 Marco Nelissen <marcone@google.com> Test for playback position at end of playback

Bug: 12916943

Change-Id: I49a756a543d55718ef2cce243de8dcfdc35c1ab5
es/raw/test1m1shighstereo.mp3
rc/android/media/cts/MediaPlayerTest.java
23f67d00b7507bf97d699a0b6099cd9016695d00 10-Aug-2015 Phil Burk <philburk@google.com> am 3d1daf8a: am f995e5f7: am 5e8732e3: am bd3be66f: am 223de423: Merge "MIDI CTS: remove tests that pass null callback" into mnc-dev

* commit '3d1daf8a2ade4e293a313319da3eeca37e668083':
MIDI CTS: remove tests that pass null callback
223de4233097304e649706f367edaaa51c17d9d1 10-Aug-2015 Phil Burk <philburk@google.com> Merge "MIDI CTS: remove tests that pass null callback" into mnc-dev
b525474b43ed7d42b6a37a90545d4f2528733635 10-Aug-2015 Phil Burk <philburk@google.com> MIDI CTS: remove tests that pass null callback

We switched from using a HashMap to a ConcurrentHashMap in the MidiManager.
The ConcurrentHashMap does not tolerate null keys.
Passing a null key is not a required part of the API.
So rather than modify the framework code, we just removed the tests
that passed a null key.

Bug: 23033283
Change-Id: I3ed96d9ce3f42187efd9b1f4d2f624e37acd71cd
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/MidiSoloTest.java
63e543e5b455f8beed8c4e119003374dce44ac69 10-Aug-2015 Eric Laurent <elaurent@google.com> am 37cc223e: am 0fd37244: am 0fb7401d: am e05e2383: am 61143e53: Merge "Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing"" into mnc-dev

* commit '37cc223e9ba1706ab06ab7491147e0605329227f':
Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing"
61143e53fc16952acc30de9e8853881c492fc061 10-Aug-2015 Eric Laurent <elaurent@google.com> Merge "Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing"" into mnc-dev
981f93347987e0f7f7955e40222e9f3826b7d5dd 10-Aug-2015 Eric Laurent <elaurent@google.com> Revert "Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing"

This reverts commit c1c1a48e5544e2524c7477021fa6cb40ceb01939.

Change-Id: I6640803541f38874975b40bbe17831da112fbacf
rc/android/media/cts/AudioManagerTest.java
c15ba04eb622ef4022a03f0584e596116d2ea37e 08-Aug-2015 Ronghua Wu <ronghuawu@google.com> am 115596ec: am e7c5ea85: am 4be0dcde: am 4b218b9b: am 80b13757: Merge "media: log result raw data in test error message" into mnc-dev

* commit '115596ec78916fe3d8bfed98cc936ea338f94863':
media: log result raw data in test error message
86e895acb56fbca18ac40f8d4fd8cdf6d2ccfc2a 08-Aug-2015 Billy Lau <billylau@google.com> am ce7ec331: am c57e3566: am 8c055f64: am 67c8e9b1: am c1c1a48e: Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing

* commit 'ce7ec33140f608629ef6bba6b47c1bb0baa0ad53':
Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing
dc48cb0cb4da0446b192a011603a8652c7761cf4 08-Aug-2015 Billy Lau <billylau@google.com> am 9328d1f5: am 8a3adf0e: am b48f80e9: am f7c7a16d: am 53dc1e9f: Bug: 22979576 CTS: RingtoneManagerTest failing

* commit '9328d1f501fd85b1c3f6169ece0ffa889d42d7cf':
Bug: 22979576 CTS: RingtoneManagerTest failing
80b1375792e001c1fd6491b4d16a433cece50efe 08-Aug-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: log result raw data in test error message" into mnc-dev
c1c1a48e5544e2524c7477021fa6cb40ceb01939 08-Aug-2015 Billy Lau <billylau@google.com> Bug: 23003511 CTS: AudioManagerTest#testSoundEffects failing

Fix the failures in test cases caused by not having appops turned on
for write_settings operation. This is done by changing the existing
test class to that of InstrumentationTest and calling the util
methods to enable and disable appops during setup and teardown.

Change-Id: I67223a2b8c6f2877a0e67e0db6cf49abcca2ebdb
rc/android/media/cts/AudioManagerTest.java
53dc1e9f546774683bbbc4338a13929e9b3e95ff 08-Aug-2015 Billy Lau <billylau@google.com> Bug: 22979576 CTS: RingtoneManagerTest failing

Added a utils file to turn on/off appops. Also added
calls to use the utility method to turn on appops for write_settings
for RingtoneManagerTest. This should stop the tests from failing.

Change-Id: I9d787fc7dbb48c95c57d0199a3b6122a488db07f
rc/android/media/cts/RingtoneManagerTest.java
rc/android/media/cts/Utils.java
509f82b770b24046f08ec027b504a5134243afd6 06-Aug-2015 Ronghua Wu <ronghuawu@google.com> am 5e8a41a6: am bc242bc3: am 0613eacf: am 1fabd68b: am a5c4f768: Merge "media: test audio codecs in testGetMaxSupportedInstances" into mnc-dev

* commit '5e8a41a6cd665caeb28a3e08cd305c6f91e784eb':
media: test audio codecs in testGetMaxSupportedInstances
d47df650992f6ad36960130ad83c62ffd7e03c80 06-Aug-2015 Paul Mclean <pmclean@google.com> am ffd3bdfd: am 9278aef1: am c15d4a5a: am ad29ef6e: am c2be101f: Merge "Fix bugs in test_devicesInfoFields()." into mnc-dev

* commit 'ffd3bdfd2f7c472ff0a53f10d5e437c5c14fb2d6':
Fix bugs in test_devicesInfoFields().
a5c4f7689a74935cc02cc7bbd0906c300cfb6843 06-Aug-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: test audio codecs in testGetMaxSupportedInstances" into mnc-dev
c2be101f605e88e7cc25c2a19a544e7d499457b1 06-Aug-2015 Paul Mclean <pmclean@google.com> Merge "Fix bugs in test_devicesInfoFields()." into mnc-dev
5be6594052bb667a666056fcb7af21f2fe2f9440 05-Aug-2015 Paul McLean <pmclean@google.com> Fix bugs in test_devicesInfoFields().

Bug: 22792346
Change-Id: I50e976b4ccf1b2e3b153083c9f4f618e150982bb
rc/android/media/cts/EnumDevicesTest.java
930149c21fa43aff6267a0d1b6b5d4bb144a3fa5 06-Aug-2015 Daniel Xie <dxie@google.com> am f87c8f19: am 082083ea: am 75907b54: am 0ca081a8: am a254bb56: am 5230c23a: am c780339f: am 01349431: am 5d221056: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c automerge: 60a6110

* commit 'f87c8f19479743db2d463874f49067a4f3d3e042':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
a254bb56d61ce8e8e3b57b3ef2832fa279354a4a 06-Aug-2015 Daniel Xie <dxie@google.com> am 5230c23a: am c780339f: am 01349431: am 5d221056: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c automerge: 60a6110

* commit '5230c23ab1d3be91eaf99a1d831017082b69d71d':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
33f40dedf61924896d6b52a0decc5d4d47c1ebd2 03-Aug-2015 Ronghua Wu <ronghuawu@google.com> media: log result raw data in test error message

Bug: 20477364
Change-Id: If9de2b6db83b78e0fd2df881c24ba7da3087452d
rc/android/media/cts/VideoDecoderPerfTest.java
6189630a7b3f0e682da973f46880961fcf95b650 05-Aug-2015 Ronghua Wu <ronghuawu@google.com> media: test audio codecs in testGetMaxSupportedInstances

Bug: 22975494
Change-Id: I1a68bf4657dcaef4d7b4e0ab14200027edc9800a
rc/android/media/cts/MediaCodecCapabilitiesTest.java
5230c23ab1d3be91eaf99a1d831017082b69d71d 05-Aug-2015 Daniel Xie <dxie@google.com> am c780339f: am 01349431: am 5d221056: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c automerge: 60a6110

* commit 'c780339fccf6b30853359513cd1981f5cfc2f979':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
da15daf24cfc6513bbba1570ab4b1f47720311ee 03-Aug-2015 Ronghua Wu <ronghuawu@google.com> am dfc8120b: am b447a891: am 6afa8fb4: am 20dfdc18: am f87279c6: Merge "media: combine log to reduce the size" into mnc-dev

* commit 'dfc8120b6eb7eef03c9f996a3ad9ea6e7af20aa5':
media: combine log to reduce the size
f87279c65bb10e5477582aecbb05da65bd74cad9 03-Aug-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: combine log to reduce the size" into mnc-dev
dc97db7fecf19c62bf6442556f9a0d8abbcfb8b6 28-Jul-2015 Masanori OGINO <ogino.masanori@sharp.co.jp> Should create a decoder from MediaCodecList

The testHEVCDecode30fps1920x1080 would fail on a particular chipset
due to its resolution. MediaUtils.canDecode() checks the
decodability by using the specified media format. On the otherhand,
the decoder is created by DecoderTest.decodeWithChecks() which
handles the mime type extracted from the format. The failure is
caused by the difference of these methods. To resolve this issue,
the both methods should decide from the same source.

Change-Id: I9722d51573e6b98f0c21921e4e667a4eed4cbcf3
rc/android/media/cts/DecoderTest.java
6ddc974b63d321a0d058947b3d8c1da04d37ddc1 01-Aug-2015 Andy Hung <hunga@google.com> am de97282f: am a1c93604: am 7bfdbba1: am ef341611: am 1ea46b33: Merge "MediaRandomTest: restrict domain of setAudioSource() test" into mnc-dev

* commit 'de97282f7a88c764839f007a2b853aba6c61149d':
MediaRandomTest: restrict domain of setAudioSource() test
0015b1cba8826f643e11849ee0792f46eb690219 01-Aug-2015 Robert Shih <robertshih@google.com> am 0020c77f: am 22922249: am 72144156: am 7a460b00: am e01750a3: Merge "testDecodeMonoGsm: skip iff Gsm decoding is not supported" into mnc-dev

* commit '0020c77fe45ea462b489513e13041bcd54ae7009':
testDecodeMonoGsm: skip iff Gsm decoding is not supported
1ea46b33d80a10b680716a1086201d09468a58eb 01-Aug-2015 Andy Hung <hunga@google.com> Merge "MediaRandomTest: restrict domain of setAudioSource() test" into mnc-dev
11c8c85b103b4f5a250c6f7b5ab2700d356aa052 01-Aug-2015 Ronghua Wu <ronghuawu@google.com> media: combine log to reduce the size

Bug: 22504214
Change-Id: I1d1c689d45d6f05805d7f5c76bd7feb384b09edf
rc/android/media/cts/VideoDecoderPerfTest.java
103b085bca1f1663e7c6c80e5cc9d24f69fec441 01-Aug-2015 Andy Hung <hunga@google.com> MediaRandomTest: restrict domain of setAudioSource() test

Bug: 22721154
Change-Id: Ic30f52d1114cc27fb58e6ae93538a17c85e3dce1
rc/android/media/cts/MediaRandomTest.java
e01750a3b644d351a6cb99ccd439e39c102a7afc 31-Jul-2015 Robert Shih <robertshih@google.com> Merge "testDecodeMonoGsm: skip iff Gsm decoding is not supported" into mnc-dev
10e6905697fe1af4a2cc3b26eb592b5f3e0c3287 31-Jul-2015 Andy Hung <hunga@google.com> am 66c7755b: am 19a322b3: am 4590914d: am 835f9e3f: am 0b66a87b: Merge "Update AudioNativeTest to check odd channel counts" into mnc-dev

* commit '66c7755b69499651e8921e3b21b8a2a0300c85aa':
Update AudioNativeTest to check odd channel counts
0b66a87b9a688f833cc4ba661a51ec56c4879c79 31-Jul-2015 Andy Hung <hunga@google.com> Merge "Update AudioNativeTest to check odd channel counts" into mnc-dev
a521e9dba15771bbde1a14d88d6d6dd38752c2ea 31-Jul-2015 Robert Shih <robertshih@google.com> testDecodeMonoGsm: skip iff Gsm decoding is not supported

The decision on whether to run the test no longer depends on telephony
feature.

Bug: 22641979
Change-Id: Ib19f72a994673c51f5f5feea81bbae60a2363c78
rc/android/media/cts/DecoderTest.java
ab08a34c33af93e87d7a1390b1286059819eb85f 31-Jul-2015 Robert Shih <robertshih@google.com> am 322a9b12: am 5d09ea68: am d2369927: am 6c02a693: am 7701775a: Merge "testDecodeMonoGsm: skip on non-phones without Gsm decoder" into mnc-dev

* commit '322a9b125acc05def9ce9b131469ca0852107ddd':
testDecodeMonoGsm: skip on non-phones without Gsm decoder
75a701a8ae056449d82ac71c600db45f6f9741d2 31-Jul-2015 Chong Zhang <chz@google.com> am 932b0636: am 740016df: am 96360778: am 5bd80276: am dc469df7: Merge "cts: VideoEncoderTest: increase 1st frame timeout to 2sec" into mnc-dev

* commit '932b0636e10dad0ef844e2da5cc3727dc82a3a1b':
cts: VideoEncoderTest: increase 1st frame timeout to 2sec
7701775a3186b794bd8c7f79711c084d3627aa3d 31-Jul-2015 Robert Shih <robertshih@google.com> Merge "testDecodeMonoGsm: skip on non-phones without Gsm decoder" into mnc-dev
45bec5023e915977191b24b6ec80b2708da56a4a 30-Jul-2015 Robert Shih <robertshih@google.com> testDecodeMonoGsm: skip on non-phones without Gsm decoder

Bug: 22641979
Change-Id: I06df6f8b801e4173ea7b3df68efcc9e84de60680
rc/android/media/cts/DecoderTest.java
dc469df7b3c0526af53fba0178281922c9b3a830 31-Jul-2015 Chong Zhang <chz@google.com> Merge "cts: VideoEncoderTest: increase 1st frame timeout to 2sec" into mnc-dev
98841cb0176710c28a089e95b109593d71da6484 30-Jul-2015 Chong Zhang <chz@google.com> cts: VideoEncoderTest: increase 1st frame timeout to 2sec

bug: 22793434
Change-Id: I4910f144f861b561957ed7be12065252a187d29c
rc/android/media/cts/VideoEncoderTest.java
ede94ca19a0a294103a274f267b7152353da33ba 30-Jul-2015 Andy Hung <hunga@google.com> Update AudioNativeTest to check odd channel counts

Bug: 22629234
Change-Id: Iccbe083e77f2586d4661ad16203817693829eabc
rc/android/media/cts/AudioNativeTest.java
4681b10262cdb7efcd044eb5cdf3452fa0989a0e 30-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 3c98cbed: am 586311c7: am 03abab34: am e5d5acc6: am 7ffe1aff: media: compute measured fps from frame time diff

* commit '3c98cbed15fc01ae51a58e12929011001a3c29a9':
media: compute measured fps from frame time diff
7ffe1affde8af674c875fed310757c70c44e8339 24-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: compute measured fps from frame time diff

Bug: 22504214
Change-Id: I59228e9c73d72d77765827d1e58b1cdb6a77fbe1
rc/android/media/cts/VideoDecoderPerfTest.java
b5a7eced1de377ae59992fd34195d690756087e7 29-Jul-2015 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE media: import Stat.

Bug: 22504214
Change-Id: I498f3ffbb753020667497be9b6385d42e69675f3
rc/android/media/cts/VideoDecoderPerfTest.java
857780f7cc978ad781480fb24477309e1d33ea57 29-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: import Stat.

Bug: 22504214
Change-Id: I498f3ffbb753020667497be9b6385d42e69675f3
rc/android/media/cts/VideoDecoderPerfTest.java
c780339fccf6b30853359513cd1981f5cfc2f979 28-Jul-2015 Daniel Xie <dxie@google.com> am 01349431: am 5d221056: Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c automerge: 60a6110

* commit '013494317ad0485044c230cbfef8d50c3110e8e6':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
5d9972ab4a86edda9787fe17b532765a08ae47b6 27-Jul-2015 Sungsoo Lim <sungsoo@google.com> am d077def7: am a0ff9809: am 3b502594: am 191dbb88: am 1d24769b: Add CTS for QueueItem

* commit 'd077def75d8c91c619562f11a63228ccf692e757':
Add CTS for QueueItem
1d24769b94aa5a5b79c420cfa927d5eca1f84888 21-Jul-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for QueueItem

Bug: 21448958
Change-Id: I19a46b06bb2c0c4f65d3217f42c95f058ae4fb4b
rc/android/media/cts/MediaSessionTest.java
19174f87fc7f6cafa7973a6e1ef2a07e54fb8228 25-Jul-2015 Andy Hung <hunga@google.com> am 60b7fe52: am 63add60a: am 077fbaaf: am 9f96d3c4: am 21afdf1b: Merge "AudioNativeTest: do not run record tests without microphone" into mnc-dev

* commit '60b7fe52e04b2531c53f544caca8eb5272149c9a':
AudioNativeTest: do not run record tests without microphone
5d221056883baf4c3763d800e8782b920752b203 25-Jul-2015 Daniel Xie <dxie@google.com> Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev automerge: 73c024c
automerge: 60a6110

* commit '60a61108b9777fa557a8cfbd8e2ad25a76451c01':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
60a61108b9777fa557a8cfbd8e2ad25a76451c01 25-Jul-2015 Daniel Xie <dxie@google.com> Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev
automerge: 73c024c

* commit '73c024cb70e74a20e75bc04ea1a7b85256505329':
Revert "improve TestVirtualDisplayRecycles to reduce memory usage"
abb7995d76b30fe90adac3e8f3515fdbb4f5472b 24-Jul-2015 Andy Hung <hunga@google.com> AudioNativeTest: do not run record tests without microphone

Bug: 22723523
Change-Id: Idb006726b9dc844112a59c1436b00870344806aa
rc/android/media/cts/AudioNativeTest.java
e1f45f81ce3833ebff25c705a9d364c4d66164d2 24-Jul-2015 Billy Lau <billylau@google.com> am 72e14379: am 092d8fab: am 8985053a: am d792755c: am 94601eb2: Merge "Bug: 22477687 CTS RingtoneTest#testRingtone failing" into mnc-dev

* commit '72e1437987290746d9c96a9b6c1bb4c7096154c9':
Bug: 22477687 CTS RingtoneTest#testRingtone failing
94601eb2a20fb94896fd0699d6e27e3af98f74ec 24-Jul-2015 Billy Lau <billylau@google.com> Merge "Bug: 22477687 CTS RingtoneTest#testRingtone failing" into mnc-dev
8e05c8bcf683446ac6788c85318e8bf18329371e 24-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 76cc3445: am 1ea98088: am 912a623b: am 47aafdb7: am 8ad06b49: Merge "media: fix potential memory leak in test." into mnc-dev

* commit '76cc34453ee2e56849d795dd8b87eb11c1e8a92f':
media: fix potential memory leak in test.
8b2f528c040a8c7fd368c1a0e555c405b1643f46 24-Jul-2015 Colin Cross <ccross@android.com> resolved conflicts for merge of a6d9c753 to master

Change-Id: Ib86320eabe7384c7ee2bebdb2ef6f453606ccfa3
98e1bad64e5497e2e0f2f6306fb7733d5e5a7dce 24-Jul-2015 Ronghua Wu <ronghuawu@google.com> am d7063585: am 1562fb62: am 9bc15a48: am c830ba49: am de98cf52: Merge "media: use small frame size for resource manager test." into mnc-dev

* commit 'd70635858f00e6d233a612a3f0f8a867cab668fa':
media: use small frame size for resource manager test.
8ad06b4922f1a0b29c7a16f85abfe5db763152c0 24-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: fix potential memory leak in test." into mnc-dev
a18399f609b3d2065fb15634435d7249f824ed5c 24-Jul-2015 Andy Hung <hunga@google.com> Merge "AudioRecordTest: Don't consider notifications after stop" into mnc-dev
d8304cc0d351db3b43364658f087100a41a47309 24-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: fix potential memory leak in test.

Change-Id: I71b5d31cb2a3b854f9e16e8e189c1d1f2d408782
Bug: 22700304
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/ResourceManagerTestActivityBase.java
c9b2deeff46a177a1e4e0d893b72c8d3b7d96f14 24-Jul-2015 Andy Hung <hunga@google.com> AudioRecordTest: Don't consider notifications after stop

Bug: 22173057
Change-Id: Idca9748c7082acf613762c039e608a3ee90e1144
rc/android/media/cts/AudioRecordTest.java
6cf6c80745738266f50a1cdac93577caf52a2fe9 23-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "Revert "DO NOT MERGE media: collect frame time diff log for certain build"" into mnc-dev
de98cf5254f1745831ce40b76900db2d84cf5a84 23-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: use small frame size for resource manager test." into mnc-dev
b6d09feb65f023c521383399e3f7035523dd7049 23-Jul-2015 Billy Lau <billylau@google.com> Bug: 22477687 CTS RingtoneTest#testRingtone failing

Fixed the failing ringtone test by enabling appops before performing
tasks that modify system settings.

Change-Id: I208ec5cf291a4a5be328114bd4739257995397b1
rc/android/media/cts/RingtoneTest.java
ab0a701732f4ec92cffc339f0be28eefaf2c3cc6 22-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: use small frame size for resource manager test.

also fix a case when secure codec is not aviable.

Bug: 21559495
Change-Id: Ia2bdae7b6be371f3832cf168022f91cce8d78b43
rc/android/media/cts/ResourceManagerTestActivityBase.java
73c024cb70e74a20e75bc04ea1a7b85256505329 22-Jul-2015 Daniel Xie <dxie@google.com> Merge "Revert "improve TestVirtualDisplayRecycles to reduce memory usage"" into kitkat-cts-dev
0f2b34390c2c5e4704281cb30c16bacdc69ae0e3 22-Jul-2015 Daniel Xie <dxie@google.com> Revert "improve TestVirtualDisplayRecycles to reduce memory usage"

This reverts commit 1c01e9d1bb4724b983e9d756ce7238a162f9f7a2.

Change-Id: Iddc7005002979d4e11e438ee903eea5ebf9b4c43
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
0e1392c2d7a092ff49354a80567e4752d18b6770 19-Sep-2014 Andy Hung <hunga@google.com> Fix AudioTrackTest.testGetTimestamp

Made more stable for different HW platforms.
Added Report logging for jitter.

Bug: 17500505
Change-Id: I4d45c15297aec4d0cef69ec9bc3c276d89d87bca
rc/android/media/cts/AudioTrackTest.java
9651ae8d61b522197129e2e1390a5305eaf59bb7 21-Jul-2015 Andy Hung <hunga@google.com> am 2b7e31b7: am f52e03a2: am cb20b4d0: am 9e69023e: am e5743abf: Merge "Add OpenSL ES multichannel record test" into mnc-dev

* commit '2b7e31b7d8b01c96d008f945f40d33de481462ad':
Add OpenSL ES multichannel record test
d66c60067c9bf61613b59c2c8fa45bdab64c46bf 21-Jul-2015 Andy Hung <hunga@google.com> am de974a4f: am 803a56a5: am 96c5850b: am b57ec986: am 7058632d: Merge "Add OpenSL ES multichannel playback test" into mnc-dev

* commit 'de974a4f298742f7c16f1205f156410926480ffc':
Add OpenSL ES multichannel playback test
87d45a0e720085981d3d0659a91ea610dc9f901f 21-Jul-2015 Andy Hung <hunga@google.com> am a80c5d5b: am c53e1fb6: am 3e8ff45f: am fc084440: am 3756a253: Merge "Inital stubbing-in of OpenSLES tests." into mnc-dev

* commit 'a80c5d5be6cfa60e3ae8a39eb2dd15cc0d4be054':
Inital stubbing-in of OpenSLES tests.
e5743abf27573861e36c42a42a7e722cf4807575 21-Jul-2015 Andy Hung <hunga@google.com> Merge "Add OpenSL ES multichannel record test" into mnc-dev
21ac39e9a6aeebce71c3d089cfee7aefc907d26d 21-Jul-2015 Ronghua Wu <ronghuawu@google.com> am a335ee0a: am 00fee4af: am 2b58889a: am 5406184a: am e50cdc49: Merge "media: move timeout timer to the worker thread to unblock onCreate." into mnc-dev

* commit 'a335ee0aa24ab6a48cf896497ccbf7ad5a5cb9e5':
media: move timeout timer to the worker thread to unblock onCreate.
7058632de0e1e377b9cde569ba7dad527b90d66e 21-Jul-2015 Andy Hung <hunga@google.com> Merge "Add OpenSL ES multichannel playback test" into mnc-dev
61083e068e07a6af71f773d2f278dfd31a903d6a 20-Jul-2015 Andy Hung <hunga@google.com> Add OpenSL ES multichannel record test

Bug: 11532760
Change-Id: I3d993d513ecb6722b8974c70037cc594654a191e
ibaudiojni/Android.mk
ibaudiojni/Blob.h
ibaudiojni/audio-record-native.cpp
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioNativeTest.java
rc/android/media/cts/AudioRecordNative.java
cc5fcc3b56c68884a53da52fb1ead8a248f781e7 17-Jul-2015 Andy Hung <hunga@google.com> Add OpenSL ES multichannel playback test

Bug: 11532760
Change-Id: I4b2f38a9919d2afc2157823f4db4bccf25829205
ibaudiojni/Android.mk
ibaudiojni/Blob.h
ibaudiojni/Gate.h
ibaudiojni/audio-track-native.cpp
ibaudiojni/sl-utils.h
rc/android/media/cts/AudioNativeTest.java
rc/android/media/cts/AudioTrackNative.java
3756a25318137c5cae959dd21690a639dae44f8c 21-Jul-2015 Andy Hung <hunga@google.com> Merge "Inital stubbing-in of OpenSLES tests." into mnc-dev
006a8ac9b90fd95fa31491fa0226f8e908e1fbc1 21-Jul-2015 Ronghua Wu <ronghuawu@google.com> Revert "DO NOT MERGE media: collect frame time diff log for certain build"

This reverts commit 1cd6a95672d9ce89fd20363d3d44f11823c8f08a.

Bug: 22552978
rc/android/media/cts/VideoDecoderPerfTest.java
17e4046ab317d8583e3bc58cafc8df3924a430a0 20-Jul-2015 Daniel Xie <dxie@google.com> Revert "Fix AudioTrackTest.testGetTimestamp"

This reverts commit c3753d0c65bfa40b5f6d1ae6b09d60710b428d9a.

Change-Id: I9d50ea421c24b9e0adc3fef61a5cbf7b2c9c385f
rc/android/media/cts/AudioTrackTest.java
bd4939ab3f12c31fa916519b2967acf5186d20bc 26-Jun-2015 Paul McLean <pmclean@google.com> Inital stubbing-in of OpenSLES tests.

Add tests from OpenSL ES 1.0.1 Appendix B.1.1 and B.1.2.

Bug: 11532760
Change-Id: Ic5c45be0416855ea84f9c9b3cd544483f154a7cd
ndroid.mk
ibaudiojni/Android.mk
ibaudiojni/appendix-b-1-1-buffer-queue.cpp
ibaudiojni/appendix-b-1-2-recording.cpp
ibaudiojni/sl-utils.cpp
ibaudiojni/sl-utils.h
rc/android/media/cts/AudioNativeTest.java
c3753d0c65bfa40b5f6d1ae6b09d60710b428d9a 19-Sep-2014 Andy Hung <hunga@google.com> Fix AudioTrackTest.testGetTimestamp

Made more stable for different HW platforms.
Added Report logging for jitter.

Bug: 17500505
Change-Id: I5d79d84eea4746b8599dbce2a3d27beaededd664
rc/android/media/cts/AudioTrackTest.java
18019e9e4ca4ce573d18b3600e9eef467bed06a9 24-Oct-2014 keunyoung <keunyoung@google.com> increase wait timeout and reduce dequeue buffer time-out

- in some devices, decoder is so slow that it is not giving output withint given time.
- increase time-out for now.
- This latency will be addressed in later release

bug: 18094786
bug: 18084984

Change-Id: I54ed512024485d938465cb0cff76c00b9e345add
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
e50cdc49a139830766ab7f02145338e21c227089 20-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: move timeout timer to the worker thread to unblock onCreate." into mnc-dev
a9b7e0ab646186b4a0d2efa911815612680bd4a0 18-Jul-2015 Daniel Xie <dxie@google.com> am 36f06f58: am f84bd634: am b44f0f6f: am 24115afd: am 49175aea: am 26fb5e4c: am 4fabed10: am d3303b5a: am 20c50498: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 automerge: 0d8dcd5

* commit '36f06f586aaf5f9c2157d330a366a94d95266ae1':
Modified testRecorderCamera() to get camera supported resolution for testing.
49175aeaec53d322f72cca65990e6c3364d3d3d5 18-Jul-2015 Daniel Xie <dxie@google.com> am 26fb5e4c: am 4fabed10: am d3303b5a: am 20c50498: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 automerge: 0d8dcd5

* commit '26fb5e4c9ef4e9d2911898503a04063ba6df4d29':
Modified testRecorderCamera() to get camera supported resolution for testing.
26fb5e4c9ef4e9d2911898503a04063ba6df4d29 18-Jul-2015 Daniel Xie <dxie@google.com> am 4fabed10: am d3303b5a: am 20c50498: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 automerge: 0d8dcd5

* commit '4fabed1095044b0437db41fbc4f6737505d0810d':
Modified testRecorderCamera() to get camera supported resolution for testing.
4fabed1095044b0437db41fbc4f6737505d0810d 18-Jul-2015 Daniel Xie <dxie@google.com> am d3303b5a: am 20c50498: Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733 automerge: 0d8dcd5

* commit 'd3303b5a12746a5639527c4c3f2b77c2dd6c28a8':
Modified testRecorderCamera() to get camera supported resolution for testing.
20c5049891f6618981bde308380865f22dc93dec 17-Jul-2015 Daniel Xie <dxie@google.com> Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev automerge: 52a2733
automerge: 0d8dcd5

* commit '0d8dcd5d029cfa74cc046b6fa5fbf1bbdfd37254':
Modified testRecorderCamera() to get camera supported resolution for testing.
0d8dcd5d029cfa74cc046b6fa5fbf1bbdfd37254 17-Jul-2015 Daniel Xie <dxie@google.com> Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev
automerge: 52a2733

* commit '52a2733a605dfbf48ccd5cb34903a00ce3d5e71a':
Modified testRecorderCamera() to get camera supported resolution for testing.
52a2733a605dfbf48ccd5cb34903a00ce3d5e71a 17-Jul-2015 Daniel Xie <dxie@google.com> Merge "Modified testRecorderCamera() to get camera supported resolution for testing." into kitkat-cts-dev
9531b995c3a03bc9ffb9882198ed2b36b2611bf4 17-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: move timeout timer to the worker thread to unblock onCreate.

plus some other minor tweaks on test.

Bug: 22528409

Change-Id: I4ef10078ea446aab13e8e543ad29efc07d5c2ea0
rc/android/media/cts/ResourceManagerStubActivity.java
rc/android/media/cts/ResourceManagerTestActivity1.java
rc/android/media/cts/ResourceManagerTestActivityBase.java
b14e2fbf1822b0c12d89b0febb146e2d1c1b9ffe 17-Jul-2015 Lajos Molnar <lajos@google.com> am 74513a13: am a939bb0c: am 19a9ef7f: am bc712f88: am 7597faa9: Merge "media: handle MediaSyncTest video decoder callbacks on a separate thread" into mnc-dev

* commit '74513a13cfb07ac038f7a2a984493da4956c02d2':
media: handle MediaSyncTest video decoder callbacks on a separate thread
f4cf2b99d79a98f003c09c4c0d8f1d5d6833b24e 17-Jul-2015 Lajos Molnar <lajos@google.com> media: handle MediaSyncTest video decoder callbacks on a separate thread

Bug: 22234976
Change-Id: I7d0e436c2ccb999aba0f6e2dac178f52cf3310ac
rc/android/media/cts/MediaSyncTest.java
2f2f69a1d856dc9b5a6cdeff23bc7e508e348718 17-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "DO NOT MERGE media: collect frame time diff log for certain build" into mnc-dev
1cd6a95672d9ce89fd20363d3d44f11823c8f08a 17-Jul-2015 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE media: collect frame time diff log for certain build

Bug: 22537593
Change-Id: Ib0b607f1fbaae497e885ca0d1dc121afa017b609
rc/android/media/cts/VideoDecoderPerfTest.java
6c6f1667c6427ee60384eeb151a8a8984c04b44a 17-Jul-2015 Ronghua Wu <ronghuawu@google.com> am ad3c6248: am dfe51378: am 33bda2db: am ae45058d: am 55d5d81a: Merge "media: deliver report to host" into mnc-dev

* commit 'ad3c624853d2b2db47a3aea59171304068ecaf3a':
media: deliver report to host
55d5d81adc8f7a72b86e326835ce41cce3b4cbab 17-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: deliver report to host" into mnc-dev
b515a9094cbfcd0b98bfd7cc3411a77577b1b20f 15-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: deliver report to host

Bug: 20507129
Change-Id: Ieb35d5a76f36ecafd0b56e6a85136f9c9369fb37
rc/android/media/cts/VideoDecoderPerfTest.java
913a7f824a66c8b05fde8a3cc0bdea0e6eff19c8 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: revert "Moving to common compatibility utils."" as we have facade for logging support now."
c493c0fc6ca8adac0e15387058be39470be29187 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 4e828052: am a858a9f1: am ed1a37b1: am f30532d4: am 85d33ed5: Merge "media: test with platform limit instead of reported limit" into mnc-dev

* commit '4e828052ef0c562281bdc7fd6363cfd231adcc88':
media: test with platform limit instead of reported limit
1715fe2552261bec2bf12a0e5a548af395e4ba7f 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> am c1df11f2: am e53a11a4: am 46509aaf: am a95a3200: am 59e07f95: Merge "media: release codec in the case of exception" into mnc-dev

* commit 'c1df11f28b69b2b10f40c60489dcde03b51d23be':
media: release codec in the case of exception
46177ac9aa26f1c339f895ca390a6b5c237bfc9c 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: revert "Moving to common compatibility utils."" as we have facade for logging support now.

Bug: 21762834
Change-Id: I6c45adbd17c111c35fc83ea50f1cbb02e8a3b3f9
rc/android/media/cts/VideoDecoderPerfTest.java
85d33ed5f2dc092e9e0bff4f7ab847a03fd36890 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: test with platform limit instead of reported limit" into mnc-dev
59e07f9584c88230a439b5408e3888e37c64f7a4 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: release codec in the case of exception" into mnc-dev
74f3e2428c86ce4a6a6c0f1d2e322b8351688d16 09-Jul-2014 yoongeun.kwon <yoongeun.kwon@lge.com> Handling NPE in case of AVC level under 2

In case of using AVC level under 2, getAvcSupportedFormatInfo returns null.
But in some functions, without null point handling, error reproduced.

So first, in case of calling function getAvcSupportedFormatInfo,
(func doTestVirtualDisplayRecycles, checkMaxConcurrentEncodingDecodingResolution)
handled NPE if codecInfo is null

Second, some test functions call func checkMaxConcurrentEncodingDecodingResolution.
Below tests are affacted on this, handled NPE on their code.
Lists are like below.
- testRendering800x480Locally
- testRenderingMaxResolutionLocally
- testRendering800x480Remotely
- testRenderingMaxResolutionRemotely
- testRendering800x480RemotelyWith3Windows
- testRendering800x480LocallyWith3Windows
- testVirtualDisplayRecycles
With this modification, fail with using AVC level under 2 caused by NPE pass the test.

Change-Id: Ib408a9d0f5f9429d11677313c08413e63c286da4
Signed-off-by: Yoongeun Kwon <yoongeun.kwon@lge.com>
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
6f5bed98fa215529c216088572c3f72a144f1c81 16-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: release codec in the case of exception

Bug: 21171205
Change-Id: I804d9b29d965d0b1f2eca4eedf85b087ebb7b4a0
rc/android/media/cts/ResourceManagerTestActivityBase.java
1f6e28cce75d5b5053419d04becb284f0656c668 15-Jul-2015 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Revert "Check for microphone feature in video camera recording tests."" into kitkat-cts-dev
78066c63e227ef9ecc0075fe5d1d5ad4a6209270 15-Jul-2015 Yin-Chia Yeh <yinchiayeh@google.com> Revert "Check for microphone feature in video camera recording tests."

This reverts commit 4621783a3e991184481bc8f2f853c4888fa78bdb.

Change-Id: I1be7e035da4f6bb4a9122e2860755da705849788
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaRecorderTest.java
72893be85e17b0047728902cef1bfaf4fd75ac32 15-Jul-2015 Daniel Xie <dxie@google.com> Merge "Check for microphone feature in video camera recording tests." into kitkat-cts-dev
102c5ff3d0ef13f1bd7fa4e67d128cbd4a5faa1e 15-Jul-2015 Daniel Xie <dxie@google.com> am 6ba5081d: am e5fa89f6: am 1b202910: am a836fc55: am bfe2ee46: am 5695eb5b: am befe5feb: am 09db5570: am d264fc1f: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac automerge: 0ff36b1

* commit '6ba5081daa841a95fa14c1649363cde4363311e7':
DEV HACK: cts: increase permitted colour delta
bfe2ee4639d022ee7119f5a937ba837e0ef90400 15-Jul-2015 Daniel Xie <dxie@google.com> am 5695eb5b: am befe5feb: am 09db5570: am d264fc1f: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac automerge: 0ff36b1

* commit '5695eb5b1ebdd51c0098c850b711a36019da6d11':
DEV HACK: cts: increase permitted colour delta
5695eb5b1ebdd51c0098c850b711a36019da6d11 15-Jul-2015 Daniel Xie <dxie@google.com> am befe5feb: am 09db5570: am d264fc1f: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac automerge: 0ff36b1

* commit 'befe5febb086ceae6c5b32182c96f791c4c46a14':
DEV HACK: cts: increase permitted colour delta
befe5febb086ceae6c5b32182c96f791c4c46a14 15-Jul-2015 Daniel Xie <dxie@google.com> am 09db5570: am d264fc1f: Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac automerge: 0ff36b1

* commit '09db5570c75634d590060d6115c8b070153b65c3':
DEV HACK: cts: increase permitted colour delta
d264fc1feae3d5dc9170eaa46d33ea3f78dfb93b 15-Jul-2015 Daniel Xie <dxie@google.com> Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev automerge: 52948ac
automerge: 0ff36b1

* commit '0ff36b1a034fc8b26a153aa4404e13560efc61bd':
DEV HACK: cts: increase permitted colour delta
0ff36b1a034fc8b26a153aa4404e13560efc61bd 15-Jul-2015 Daniel Xie <dxie@google.com> Merge "DEV HACK: cts: increase permitted colour delta" into kitkat-cts-dev
automerge: 52948ac

* commit '52948ac477b0f9cd0d52d91a6105b4d554426f83':
DEV HACK: cts: increase permitted colour delta
f9ef10889ec47be815ed6c86ff43d6916d7b2a5d 10-Apr-2014 Matthew Hails <mhails@broadcom.com> DEV HACK: cts: increase permitted colour delta

Increase the permitted precision in EncodeVirtualDisplayTest
as proof-of-concept to allow for 5-bit precision in each colour
component.

The Broadcom Capri GLES driver currently uses RGB565 for video
on texture, which only provides 5 bits of precision; whereas this
test requires 6.

Change-Id: I66393485055ec92906124d76f7ae85d88592eb10
Refs: SW-13226

Change-Id: Ia3bf1599c85bd6be0f00dd5d86f548006b1eec18
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
rc/android/media/cts/EncodeVirtualDisplayTest.java
c9f86eafbe783f60cd4aa9936eebbc8c0926d555 15-Jul-2015 Daniel Xie <dxie@google.com> am c2f240e1: am 18d19445: am 51c10bac: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f automerge: d62c086

* commit 'c2f240e1a854a2d0f1a6e2585d143f9b4c283a27':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
c2f240e1a854a2d0f1a6e2585d143f9b4c283a27 15-Jul-2015 Daniel Xie <dxie@google.com> am 18d19445: am 51c10bac: Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f automerge: d62c086

* commit '18d194457a3bf86efbef07619ab991b01a1d8ebb':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
51c10bac616fa3cedd7730df6ce6e0117ac7add2 14-Jul-2015 Daniel Xie <dxie@google.com> Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev automerge: 4d7e03f
automerge: d62c086

* commit 'd62c086b9e0b8e419749fbc2d7105b0974951780':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
0ca5bbe9c5c88b6c21dac54629745b59fd6190dd 14-Jul-2015 Daniel Xie <dxie@google.com> Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev automerge: ba39064
automerge: 83ca91c

* commit '83ca91cd6af0e6c67a3f9fa33ff880d0c55f87f9':
improve TestVirtualDisplayRecycles to reduce memory usage
778c37cff4fa34f27451a2c5eae6788fa2aeced9 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> Revert "media: deliver test report to host."

Failed to build on master.

This reverts commit 66f5dec2becfa4dd81ccefc30d5422654dc8a33b.

Change-Id: I423a1c66a21623582b2e8eab57ca7bfc4d53697a
(cherry picked from commit 7c0cc59cbe56d1ea48f346cf20c56cfe45705422)
rc/android/media/cts/VideoDecoderPerfTest.java
d62c086b9e0b8e419749fbc2d7105b0974951780 14-Jul-2015 Daniel Xie <dxie@google.com> Merge "Fix configure check regarding AdaptivePlayback ReconfigDrcTest." into kitkat-cts-dev
automerge: 4d7e03f

* commit '4d7e03fcaa198962cb50969dc7c05797e3ed2195':
Fix configure check regarding AdaptivePlayback ReconfigDrcTest.
83ca91cd6af0e6c67a3f9fa33ff880d0c55f87f9 14-Jul-2015 Daniel Xie <dxie@google.com> Merge "improve TestVirtualDisplayRecycles to reduce memory usage" into kitkat-cts-dev
automerge: ba39064

* commit 'ba39064dd7b3a60cefd1998bf0cff706ce5ef825':
improve TestVirtualDisplayRecycles to reduce memory usage
e33b57325dee08ccfce5651cb2793485fd655883 20-Feb-2014 git-myeonghwan.wee.lge.com <myeonghwan.wee@lge.com> Use Supported Camera resolution.

MediaPlayerTest.java
Line 540: Code add. Resolution check & Resolution Setting.

MediaRecorderTest.java
Line 54 : add Variables.
Line 193 : Function call.
Line 201 : make sure the camera tests only use supported camera resolution.

Signed-off-by: myeonghwan wee <myeonghwan.wee@lge.com>

Change-Id: Iad9e14383d4725ce012ce3626cc83f56d1c871fb
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaRecorderTest.java
390ec0508374b56de3660dc165851e66e880d12e 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "Revert "media: deliver test report to host."" into mnc-dev
7c0cc59cbe56d1ea48f346cf20c56cfe45705422 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> Revert "media: deliver test report to host."

Failed to build on master.

This reverts commit 66f5dec2becfa4dd81ccefc30d5422654dc8a33b.

Change-Id: I423a1c66a21623582b2e8eab57ca7bfc4d53697a
rc/android/media/cts/VideoDecoderPerfTest.java
5b97582cab16128fef695e47c72a619767771130 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 46d326be: am 4713a1b6: am b75f1bf2: am 7e9f3ac6: am 5dab5884: Merge "media: add more resource manager tests to cover secure codec cases." into mnc-dev

* commit '46d326be21692968e40c4e744a7fa0707efa405d':
media: add more resource manager tests to cover secure codec cases.
0a4e76d6b5539311742da41ebca5d30645c17f3c 25-Aug-2014 yoongeun.kwon <yoongeun.kwon@lge.com> Skip encoding tests for unsupported resolutions.

Some low-tier chipsets do not support video encoding at resolutions
above 720p (1280x720). However, some of the CTS tests attempt to encode
at these resolutions even if they are not supported, and therefore fail.

To fix this, because running the test itself, check that the video size
is supported, and skip the test if not.

To check whether the resolution is supported, for the AVC case, compare
the requested resolution with the limits specified in the AVC
specification, based on the level supported by the encoder.

Change-Id: I3ecb8d30235c8fef854551ce2b10c65ae72d86f9
Signed-off-by: Yoongeun Kwon <yoongeun.kwon@lge.com>
(cherry picked from commit 6ca61238b53c6dbb70a97ca30ca952789d89edfd)
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
dc69642efb0f3b92a05bca451853b4008bda02d2 08-Jul-2014 joongeun.choi <joongeun.choi@lge.com> Fix configure check regarding AdaptivePlayback ReconfigDrcTest.

1. Change configureAndStart function type from "void" to "boolean".
When configureAndStart is called, then codec configure and start directly.
But if codec is unsupported(such as not supported high resolution contents),
it generates configure excention. So, it is necessary that check weather
codec is supported or not.

2. Add try-catch in configureAndStart function.
If codec configure failed, then catch this exception. This process can avoid
codec configure exception.

3. Modify configure check condition in ReconfigDrcTest class.
ReconfigDrcTest use 360p and 720p contents. So, if device can't support 720p,
this condition will run next step without exception.

Change-Id: I6b423e74a279d978c43fbebd16f22e67c9cb0f87
Signed-off-by: Joongeun Choi <joongeun.choi@lge.com>
rc/android/media/cts/AdaptivePlaybackTest.java
1c01e9d1bb4724b983e9d756ce7238a162f9f7a2 02-Jul-2014 Harry Hong <harryhong77@gmail.com> improve TestVirtualDisplayRecycles to reduce memory usage

TestVirtualDisplayRecycles allocates lots of memory.
in low memory system, this test get failed because
android.media.cts process died by low-memory killer easily.

To prevent low memory case during test,
- clear the allocated buffer for dalvik to get more chance
to do GC at window cleanup
- call cleanupGl() at stopComposition

Change-Id: I1c118ceba9dfe29a84bd9edad43eac21ba50a92b
Signed-off-by: Harry Hong <hhong@nvidia.com>
(cherry picked from commit caf25cf58f45c3c2039de16d37242deab0e45c57)
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
3c2ea512e1d4fdcf918a51b273cb344d9b140036 14-Jul-2015 Wei Jia <wjia@google.com> am d2d801e4: am 71e601d8: am c4d3aa9a: am 566b300d: am 590a39c9: Merge "MediaSyncTest: use float for playback rate tolerance to keep consistent with others." into mnc-dev

* commit 'd2d801e4663654a302eb0d040b10863d75b41470':
MediaSyncTest: use float for playback rate tolerance to keep consistent with others.
7052daf03de66d4b4ae7e549e3ebe0a9390102d8 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 836016e6: am 85e1641b: am e6537e65: am 5892251a: am c1a9bfa5: Merge "media: deliver test report to host." into mnc-dev

* commit '836016e6079c0a3fdf05ca1b641062c2344f62b4':
media: deliver test report to host.
7e1cc7c59e920310bb0efa8486e7ad41b9fe4543 14-Jul-2015 Andy Hung <hunga@google.com> am 22f5c111: am 002d755b: am b4d01e24: am f005da18: am 2d9a9a54: Merge "AudioRecordTest: Release AudioRecord on failure" into mnc-dev

* commit '22f5c11125398ef3048f5e93f8b48d590a44f03e':
AudioRecordTest: Release AudioRecord on failure
5dab5884ab8a39d33327c90ae1daca49fedbb6be 14-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: add more resource manager tests to cover secure codec cases." into mnc-dev
2d4904df54d46d345bb9613779b1aa064518eda1 11-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: test with platform limit instead of reported limit

Bug: 22411018
Change-Id: Ibf7705b7ce11f17bbc9e7f3f6742cde0e11755da
rc/android/media/cts/MediaCodecCapabilitiesTest.java
590a39c933f180a8975422413e86b84e7dc98040 13-Jul-2015 Wei Jia <wjia@google.com> Merge "MediaSyncTest: use float for playback rate tolerance to keep consistent with others." into mnc-dev
94be2c1b3b86fff9463f7b543b63f6f543179097 13-Jul-2015 Wei Jia <wjia@google.com> MediaSyncTest: use float for playback rate tolerance to keep consistent with others.

Bug: 22069191
Change-Id: I370c67aa4e0165d13d3497203624b7af014df252
rc/android/media/cts/MediaSyncTest.java
c1a9bfa5497fa84fd3c4ff8bddba1b84bad5b358 13-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: deliver test report to host." into mnc-dev
66f5dec2becfa4dd81ccefc30d5422654dc8a33b 13-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: deliver test report to host.

Bug: 20507129
Change-Id: Ie1472edf1f2f521d1838f0907866b973550877d3
rc/android/media/cts/VideoDecoderPerfTest.java
6bf5b37e4d39a969b22d22347dacf6a7b360d339 23-Jul-2014 Jungyee Yoo <jungyee.yoo@lge.com> Chage the timeout while rendering to overcome the low performance device.

b/16502836

Change-Id: I24934eefeb89553604ba17cddd1ba1b3ee045216
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
6006a91403f6e633e243728ea0531f9e47e47483 07-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: add more resource manager tests to cover secure codec cases.

Bug: 21171205
Change-Id: Icde17f33449742100fd393a635861a991b046a44
rc/android/media/cts/ResourceManagerStubActivity.java
rc/android/media/cts/ResourceManagerTest.java
rc/android/media/cts/ResourceManagerTestActivity1.java
rc/android/media/cts/ResourceManagerTestActivity2.java
rc/android/media/cts/ResourceManagerTestActivityBase.java
2d9a9a541636d0aa25c4ee6553855a45a0500f31 11-Jul-2015 Andy Hung <hunga@google.com> Merge "AudioRecordTest: Release AudioRecord on failure" into mnc-dev
830104c353e9ada2be90ad16b8a5b2abcafb8d27 10-Jul-2015 Andy Hung <hunga@google.com> AudioRecordTest: Release AudioRecord on failure

Reduces the collateral test failures as AudioRecord
is a system-wide resource.

Bug: 22173057
Change-Id: I30ed19b967417eeba8149e0e0fe45ec4187ec015
rc/android/media/cts/AudioRecordTest.java
2e51868a583d523cfbbb5e6a243a86be02ec19e3 10-Jul-2015 Eric Laurent <elaurent@google.com> am 269f99f5: am e4bb43a8: am 7f4d79e3: am 6fd987be: am 64798934: Merge "AudioRecord tests: only with a microphone" into mnc-dev

* commit '269f99f56cecb0491125f35b84a0b6d4a5949b47':
AudioRecord tests: only with a microphone
52e80671babc8f83e3c2b248c78ee2db2b44d707 10-Jul-2015 Jean-Michel Trivi <jmtrivi@google.com> AudioRecord tests: only with a microphone

Try to build an AudioRecord instance only when the FEATURE_MICROPHONE
is present.

Bug 22379284

Change-Id: Ice501fec72644a73ef2ce30d1c737990caf2cf84
rc/android/media/cts/AudioRecordTest.java
ed0e65e480246bdcfd22fee8c224fcdbd779c1d3 10-Jul-2015 Ronghua Wu <ronghuawu@google.com> am fc21cd1b: am 09e01510: am 25a8fc1d: am e03666d8: am 4f00a44c: Merge "media: VideoDecoderPerfTest test fixes" into mnc-dev

* commit 'fc21cd1b03424c8884381b0a5a25f84ecc82ac88':
media: VideoDecoderPerfTest test fixes
43a891a447ab3b3eb2bff678b6b398a797a2c4b0 09-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: VideoDecoderPerfTest test fixes

Also reduce the test frame number to avoid test timeout.

Bug: 22377021
Change-Id: Icb83764d781c0a292506cc10fba3b40a574f9391
rc/android/media/cts/VideoDecoderPerfTest.java
92423df543c8e11070c57585a6450e7f4e9a1a42 08-Jul-2015 Stuart Scott <stuartscott@google.com> Revert "Revert "Moving to common compatibility utils.""

This reverts commit 992b459293c4dcae2a12cdf5923e3e26a476bd1a.

This change includes the fix which caused the build breakage which
caused the revert this is reverting.

bug: 21762834
Change-Id: I1df495ba219208b07a7d7c8ac99d2890052caf69
ndroid.mk
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
rc/android/media/cts/VideoDecoderPerfTest.java
0d1e54889202ee2500de20822356afbd157842e8 08-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Moving to common compatibility utils.""
992b459293c4dcae2a12cdf5923e3e26a476bd1a 08-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> Revert "Moving to common compatibility utils."

This reverts commit b054026b4d0347f958de7c4b3eaa6a52ff3d20cd.

Master is red, fixing the build by reverting all CL's merged from
b/21762834 today.

Bug: 21762834

Change-Id: Ibe31d8b615e55387ebbbd953f793f491ee30a2e8
ndroid.mk
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
aa47897e31232afaf0c487ea26134bbb5392bb95 08-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 2d4d9cb2: am 46591787: am 971c267e: am 138f1a69: am 5797bb15: Merge "media: add VideoDecoderPerfTest" into mnc-dev

* commit '2d4d9cb2b93dc96e843e607f128193aec086850a':
media: add VideoDecoderPerfTest
5797bb156ac2ee872fcee986232f9fd7b9b4dd16 08-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: add VideoDecoderPerfTest" into mnc-dev
b054026b4d0347f958de7c4b3eaa6a52ff3d20cd 06-Jul-2015 Stuart Scott <stuartscott@google.com> Moving to common compatibility utils.

bug:21762834
Change-Id: Ie0bf75bb1621308118633f41e063df40b529478d
ndroid.mk
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
184fe135fce5a9fb3c8705e401fb6ce682a09a18 06-Jul-2015 Ronghua Wu <ronghuawu@google.com> am 753932cb: am d0c6eaea: am cb7962c0: Merge "media: increase the wait time for resource manager test." into mnc-dev

* commit '753932cb8783af503161c5d411b05a9ea49d06af':
media: increase the wait time for resource manager test.
cb7962c01f5b5f48874e75de9787962151470e26 06-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: increase the wait time for resource manager test." into mnc-dev
fd4f7602bbc808895a67c397a8e55223aadb7ec0 08-May-2015 Tochau Hoang <tochau.hoang@panasonic.aero> Modified testRecorderCamera() to get camera supported resolution for testing.

Try to retrieve supported resolution from camera first. If the effort fails for any reasons, fall back to use the default video width and height.

Change-Id: I0947558172973663853bc0c694f851495af06fb8
Signed-off-by: Tochau Hoang <tochau.hoang@panasonic.aero>
rc/android/media/cts/MediaRecorderTest.java
4fadb2bebc3a5a3eb4c183f4428fd16482d2b988 01-Jul-2015 Ronghua Wu <ronghuawu@google.com> am e8f0cacb: am ff1ab029: am ea2015c6: Merge "media: log expected codec limit for concurrent instances as xml" into mnc-dev

* commit 'e8f0cacb9f378c4e3d4d8df9bb18ee42d2d0fe22':
media: log expected codec limit for concurrent instances as xml
2cf1afcabd1676197f98694dcc07cc028da56ef1 27-Jun-2015 Ronghua Wu <ronghuawu@google.com> media: add VideoDecoderPerfTest

Bug: 20507129
Change-Id: Ic450f37ee82c01ee31ee9d87479865d8c4467199
rc/android/media/cts/VideoDecoderPerfTest.java
ea2015c656b658a105d8addccbb93483b8071de4 01-Jul-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: log expected codec limit for concurrent instances as xml" into mnc-dev
900fdaf8455817ef70fb5e23202ed6455332f848 01-Jul-2015 Ronghua Wu <ronghuawu@google.com> media: increase the wait time for resource manager test.

Bug: 22198936
Change-Id: Ie377640de79ada9ceb1efd9c6506ac8b12a7c00c
rc/android/media/cts/ResourceManagerStubActivity.java
46dace6bcc8107e0aef6d01087523527b0e5619a 29-Jun-2015 Ronghua Wu <ronghuawu@google.com> media: log expected codec limit for concurrent instances as xml

Bug: 20477364
Change-Id: If32b3f0e40e7d607f146f7a797c218cbcafb7339
rc/android/media/cts/MediaCodecCapabilitiesTest.java
37f4b54072f3cb44d87356c1c0f8c9d55658a081 29-Jun-2015 Daniel Xie <dxie@google.com> Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev
automerge: a00f78c

* commit 'a00f78c853328979f0bc7f9dea3b29bb587b1543':
Fix for failing test of testEOS because checksum takes too long
4621783a3e991184481bc8f2f853c4888fa78bdb 27-Mar-2015 Tochau Hoang <tochau.hoang@panasonic.aero> Check for microphone feature in video camera recording tests.

Make sure that test device has a microphone before setting audio source in camera recording tests.

Change-Id: I09fc999da8476a854bba6e04ba53ec1f6fe3ac07
Signed-off-by: Tochau Hoang <tochau.hoang@panasonic.aero>
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaRecorderTest.java
8db91469e1ecbf874eca88a0bbaabd833b731707 26-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 7b6797a2: am 0efc239e: am c54b8184: Merge "resolved conflicts for merge of 6c8f8a52 to mnc-dev" into mnc-dev

* commit '7b6797a2e80e7dae20bf44c48dcfc1a2dd9584b0':
Add CTS for MediaController.Callback
c54b8184a9f56d94ae1340f751f9f073cc84c309 26-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "resolved conflicts for merge of 6c8f8a52 to mnc-dev" into mnc-dev
eee77e433106fedd413a7be28fb342731e5c2a49 25-Jun-2015 Lajos Molnar <lajos@google.com> am 1b9d9a9a: am ab90f539: am f3bfa2e9: Merge "media: Test flush before and after CSD for decoders" into mnc-dev

* commit '1b9d9a9a1b2eda94c2cdd95f323d90e53966ab01':
media: Test flush before and after CSD for decoders
96ec0b3d14819da1177f824f6aa9ab828ea5e6fe 25-Jun-2015 Lajos Molnar <lajos@google.com> am 3ddfa38b: am 0a5036fe: am e7ecc297: Merge "media: Properly calculate percentage tolerance" into mnc-dev

* commit '3ddfa38b3cf4b72aa6ee2fd459e7c7a634f1c8cc':
media: Properly calculate percentage tolerance
05602935419bdce54ff70efee0e68d8f9e6b3c99 25-Jun-2015 Lajos Molnar <lajos@google.com> media: Test flush before and after CSD for decoders

Bug: 13205664
Change-Id: Ifeafc7ea61fb67d752d9581e2560a11f75d4a411
rc/android/media/cts/AdaptivePlaybackTest.java
9c99d9dac192b7eb41aeb15b1ec101ca865d7e66 19-Nov-2013 Ryszard Grzesica <ryszard.grzesica@sonymobile.com> Fix for failing test of testEOS because checksum takes too long

While low latency port reconfiguration is on (the same as smooth
streaming but for local playback) allocated buffers has maximum
supported capacity in our case it is Full HD.
Effective buffer size is equal to HxWx3/2 but in this test capacity
was used for checksum check. So instead of check of buffer ~300k
test was checking buffer of ~3M size what makes the test to take
too long and test failed due to timeout.

In test used space of the buffer should be used.

Change-Id: Ie4854eef1d26737bfeade298ebb80f91891c8b6d
(cherry picked from commit 923bb77624d140dcf49c0eedf0c2226458e8cdd4)
rc/android/media/cts/DecoderTest.java
a429a7831401c8b82768b86e00f1306c939ccb7a 25-Jun-2015 Sungsoo Lim <sungsoo@google.com> resolved conflicts for merge of 6c8f8a52 to mnc-dev

Change-Id: I932e0ce84debd7362d542dcfa624148f6723e356
8faa44ab395414bd5cd11ab8afcc82673c20af20 25-Jun-2015 Lajos Molnar <lajos@google.com> media: Properly calculate percentage tolerance

Bug: 22069191
Change-Id: I51c78c9213f25f04c70fd9afe852f9f341a4eacc
rc/android/media/cts/MediaSyncTest.java
6c8f8a52efa6183675efe03c2ae2f775bc5fc6c4 25-Jun-2015 Sungsoo Lim <sungsoo@google.com> am b762df58: am b406f31a: am 1942f5a3: am 32ee0859: am 76b26b0f: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev automerge: 25afa64

* commit 'b762df58d44181e59b315d5faf98f921a82d51dc':
Add CTS for MediaController.Callback
b406f31ad898813126f05a40e118f65c487a31f0 25-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 1942f5a3: am 32ee0859: am 76b26b0f: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev automerge: 25afa64

* commit '1942f5a31c6e6b6cba470f6e8781ca73eb25334e':
Add CTS for MediaController.Callback
1942f5a31c6e6b6cba470f6e8781ca73eb25334e 25-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 32ee0859: am 76b26b0f: Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev automerge: 25afa64

* commit '32ee08594641ec55096c2e477190fb3b30daf888':
Add CTS for MediaController.Callback
76b26b0fa3d524fd578a0da859f241ef06d15edf 25-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev
automerge: 25afa64

* commit '25afa649171bb3821df4029d893356393b7d8b57':
Add CTS for MediaController.Callback
08cecf77b36a6fe2abfa9a0be881cd936ed05ad4 20-Jun-2015 Marco Nelissen <marcone@google.com> am 0177c2ba: am 7376fa0c: am 2def8d2e: Merge "Remove corrupt test file" into mnc-dev

* commit '0177c2baa3db769f3f3c0f7cc72ac2595b3478b5':
Remove corrupt test file
2def8d2e4dc1b9c2f6e8a499ae38a303d0cee1fa 19-Jun-2015 Marco Nelissen <marcone@google.com> Merge "Remove corrupt test file" into mnc-dev
54f21847eb733ccd1c54d4b15bba0b12e6928675 18-Jun-2015 Daniel Xie <dxie@google.com> Merge "Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"" into lmp-sprout-dev
3f36e2bba28752e2f7b8eec5ff7a7a627ba5b324 18-Jun-2015 Daniel Xie <dxie@google.com> Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"

This reverts commit 484b0887a1537de67023bd4a0ff8896ae084cff7.

Change-Id: I5b2b25f2765be92fdc4a597a11abfd232bd2da7d
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecTest.java
39c03885e6887a11efe5a5cf7168bb3223f78240 18-Jun-2015 Ricardo Garcia <rago@google.com> am 54e0f2d8: am ac381b75: am 9c2a475f: Merge "Fix for CTS LoudnessEnhancer test using Visualizer" into mnc-dev

* commit '54e0f2d8a96b7d34b85bb7e2b10ac5058490885b':
Fix for CTS LoudnessEnhancer test using Visualizer
9c2a475fa5a4a6f7da0d0bd0df6a987d0603f3d8 18-Jun-2015 Ricardo Garcia <rago@google.com> Merge "Fix for CTS LoudnessEnhancer test using Visualizer" into mnc-dev
0fdde5692fbf0ea5b2fb451e2a20cb90dd466187 13-Jun-2015 Ricardo Garcia <rago@google.com> Fix for CTS LoudnessEnhancer test using Visualizer

Added missing test to use Visualizer effect to measure actual
gain applied by LoudnessEnhancer.

bug: 10967161
Change-Id: I15b83e05239bb805a43d807387755b40a4df2155
rc/android/media/cts/LoudnessEnhancerTest.java
948eb8a7b88e436c51bd4ca53e565dcc75da6e1b 17-Jun-2015 Andy Hung <hunga@google.com> am 4f8764f1: am c575f5e8: am 8d699bff: Merge "Add CTS test to check failure to build AudioTrack" into mnc-dev

* commit '4f8764f1c09a9c326fab9839ef3e5ac9e7fcde9b':
Add CTS test to check failure to build AudioTrack
78172ec03b4a1096292c0ce57e3cb8f1206a4e6f 17-Jun-2015 Andy Hung <hunga@google.com> am 770f0d77: am fb906d75: am 0c5f32cb: Merge "Add CTS test to check failure to build AudioRecord" into mnc-dev

* commit '770f0d7712b50739200c5d8f997d144257050887':
Add CTS test to check failure to build AudioRecord
8d699bffafac2126d6e6974cd76ba7a051b1271d 17-Jun-2015 Andy Hung <hunga@google.com> Merge "Add CTS test to check failure to build AudioTrack" into mnc-dev
0c5f32cba18895d87290920fa5f8b6cd1a44b190 17-Jun-2015 Andy Hung <hunga@google.com> Merge "Add CTS test to check failure to build AudioRecord" into mnc-dev
4690584ba59ce2000f6d60578fbc6190a401e275 13-Jun-2015 Andy Hung <hunga@google.com> Add CTS test to check failure to build AudioTrack

Bug: 11671194

Change-Id: If6de95181943db6927a1ad691606ca5a52257193
rc/android/media/cts/AudioTrackTest.java
401dedce8a2f186bb84ae0d1a9ee8fc3d634ba1e 13-Jun-2015 Andy Hung <hunga@google.com> Add CTS test to check failure to build AudioRecord

Bug: 11671194
Change-Id: Ia1e35bc2aa8d71a9f36367d9be01ff9c7635dd45
rc/android/media/cts/AudioRecordTest.java
700137f3c6a019a330c64087c220c1d5dcf05de2 13-Jun-2015 Lajos Molnar <lajos@google.com> am aae95dc8: am d8aeada4: am 0d2a889c: Merge "media: skip thumbnail extractor tests if required codecs are missing" into mnc-dev

* commit 'aae95dc8b9dbcffbf10c6db60f0aa98f54a51ba3':
media: skip thumbnail extractor tests if required codecs are missing
0d2a889cfccb5eca0d55201b208192796ba86ebc 13-Jun-2015 Lajos Molnar <lajos@google.com> Merge "media: skip thumbnail extractor tests if required codecs are missing" into mnc-dev
cc8c2b23bca8d93178186d9c3c358f5c39ab8e2d 13-Jun-2015 Robert Shih <robertshih@google.com> am c537edd6: am 4c5bf9af: am fc3e7167: Merge "MediaCodecTest: added testReleaseAfterFlush" into mnc-dev

* commit 'c537edd6fad79eb5d652a988c49d1d91d98399b3':
MediaCodecTest: added testReleaseAfterFlush
fc3e71670e6016a3ff27791f2366bedba80cda3f 13-Jun-2015 Robert Shih <robertshih@google.com> Merge "MediaCodecTest: added testReleaseAfterFlush" into mnc-dev
210adca21218b68379da4a5bee9c08239be67e42 19-May-2015 Robert Shih <robertshih@google.com> MediaCodecTest: added testReleaseAfterFlush

testReleaseAfterFlush tests that holding on to an output buffer prior to
flush and releasing it afterwards throws an exception.

The test consists of four cases, or all the combinations of the
following two variables:

* whether MediaCodec is in async mode, and
* whether flush and release are invoked from the same thread

Bug: 17433811
Change-Id: I2bc1ca6b90a7e3c8765a3ca12d9e720a70cdabcb
rc/android/media/cts/MediaCodecTest.java
34dd37cf1f0444ef113f1d124a0542f4006a2f58 12-Jun-2015 Lajos Molnar <lajos@google.com> media: skip thumbnail extractor tests if required codecs are missing

Also limit exceptions caught in testThumbnail()

Change-Id: I4ce7d2d9b2bc1d73a74beee5383e2e330c2a5f59
rc/android/media/cts/MediaMetadataRetrieverTest.java
46c8c0a9ea5cae45f8567db16d7ba4a74a49ed99 11-Jun-2015 Wei Jia <wjia@google.com> am 0bcb27ba: am 55783065: am 70398a1b: Merge "MediaCodecTest: add test for decoding after flush." into mnc-dev

* commit '0bcb27bab895767bd9329f8b9e13204c032a49f4':
MediaCodecTest: add test for decoding after flush.
4625b79265b57107172a5618d8e371ce14bec7c3 11-Jun-2015 Lajos Molnar <lajos@google.com> am ec9db6e9: am 132a38cd: am 4ad33c13: Merge "Add video thumbnail generation tests" into mnc-dev

* commit 'ec9db6e92d1844fc3ccf645a1487094b80e2aa0f':
Add video thumbnail generation tests
fc639c19ea3d1aa7bc1fd2f09d3a05d965187464 11-Jun-2015 Jeff Brown <jeffbrown@google.com> am 05b4b04d: am 5ea6dc3a: am bd8edfa7: Merge "Add CTS tests for new MediaBrowser methods." into mnc-dev

* commit '05b4b04d26095c675b6815ae0914313db692214d':
Add CTS tests for new MediaBrowser methods.
70398a1bb7a497bb23bb8aeee4be407486d2e1fa 11-Jun-2015 Wei Jia <wjia@google.com> Merge "MediaCodecTest: add test for decoding after flush." into mnc-dev
e1757df51cc86815f37b4a68ad25a60ea23d1b44 11-Jun-2015 Marco Nelissen <marcone@google.com> Remove corrupt test file

One of the CTS test files was technically corrupt, and we're more
strict now so this file wasn't passing CTS anymore.

Bug: 18386956
Bug: 18872896
Bug: 21208259
Change-Id: Ie6d699649658a61692ce2ea7c2d7bc9d64668d59
es/raw/gb18030_5.mp3
rc/android/media/cts/MediaScannerTest.java
4ad33c132a6dc862cdb9060c679857a05d34add4 11-Jun-2015 Lajos Molnar <lajos@google.com> Merge "Add video thumbnail generation tests" into mnc-dev
d8e06c2f9c81a924128aa7f5df896ab83fb109d7 15-Apr-2015 Praveen Chavan <pchavan@codeaurora.org> Add video thumbnail generation tests

Test thumbnail generation for clips of each supported codec

Change-Id: I85f5381203c9d82bb3fde40db6b6e2ea30dd8b10
rc/android/media/cts/MediaMetadataRetrieverTest.java
0f61f9671db6085ebfde18ba3619964be424bcba 11-Jun-2015 Jeff Brown <jeffbrown@google.com> Add CTS tests for new MediaBrowser methods.

Bug: 21668207
Change-Id: Id6a0907224a26f7351498a8d255283bb0bde5cfc
rc/android/media/cts/MediaBrowserServiceTest.java
rc/android/media/cts/MediaBrowserTest.java
rc/android/media/cts/MediaControllerTest.java
rc/android/media/cts/StubMediaBrowserService.java
16d0d355c1b3ad5d97f9e1b38c069aa9a68ff746 26-May-2015 Wei Jia <wjia@google.com> MediaCodecTest: add test for decoding after flush.

Bug: 13205664
Change-Id: If46c7b896ca6934bfd7e89e082b0ea600dd30d24
rc/android/media/cts/MediaCodecTest.java
8d2ad058de29fe65b0b0f488f8ff89b7be4eccfa 03-Jun-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaController.Callback

Bug: 21448958
Change-Id: I46a94e32102215e81691330f981ab8242125cbee
rc/android/media/cts/MediaSessionTest.java
f10456dc04f20f28b0c85fe6b08d2463ad8b9e52 10-Jun-2015 Lajos Molnar <lajos@google.com> am 006f165f: am 266c1357: am ab6c4a93: media: Track rendered frames during AdaptivePlaybackTest

* commit '006f165f0f81a836d5f4675f246e5d6097bfe133':
media: Track rendered frames during AdaptivePlaybackTest
ab6c4a9378c5a3dcd37bfd2eff495041c8a0ef03 09-Jun-2015 Lajos Molnar <lajos@google.com> media: Track rendered frames during AdaptivePlaybackTest

Bug: 20503131
Change-Id: I3cba0adca1fff4dec9c06c6818ffb1ab7aeedc1d
rc/android/media/cts/AdaptivePlaybackTest.java
183e2a85d1fb65a5611a1b5ee83ab1e85b55848a 09-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 690a4468: am 0abe1392: am e0b99bed: am 861e46d0: am 3bd35f46: am 13c764ca: am e9fad85b: am 2d61d530: am 4f916a85: Merge "Add more CTS for MediaController" into lollipop-cts-dev automerge: ccde590

* commit '690a44681746297c530cea123c8e07cbf7e5a738':
Add more CTS for MediaController
11dcbb09920c76cfbba4438a5ebdfb1f8788d2e6 09-Jun-2015 Sungsoo Lim <sungsoo@google.com> am a48d5278: am 523f23b3: am 2c5451fb: am a5de60e7: am d8f72887: am 796571df: am 6e017c1f: am fd342e0b: am 2ceb1c4c: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev automerge: 4aeb538

* commit 'a48d5278a3e6413c13ad590e479d43e437b270c6':
Add CTS for MediaSession.setActive()
9c1b59a826b927fad3b6134e61a9edca4b40fe48 09-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 04d8c14e: am d72366c7: am 9c4be824: am 84632bc0: am e2e7be85: am 6e1af134: am c2aee8e1: am d4c00849: am e96febd3: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev automerge: b7703ec

* commit '04d8c14ee5ab713898f88662babd3cbfa3bc404d':
Add CTS for MediaBrowserService
e0b99beda6d003b27a6d5bce792e603d63dfad0c 09-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 861e46d0: am 3bd35f46: am 13c764ca: am e9fad85b: am 2d61d530: am 4f916a85: Merge "Add more CTS for MediaController" into lollipop-cts-dev automerge: ccde590

* commit '861e46d04e8089c4d0a5ac3873f1ba3f7073a6cd':
Add more CTS for MediaController
2c5451fbbb11331e56d26579bd9b7e4e1a0587a8 09-Jun-2015 Sungsoo Lim <sungsoo@google.com> am a5de60e7: am d8f72887: am 796571df: am 6e017c1f: am fd342e0b: am 2ceb1c4c: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev automerge: 4aeb538

* commit 'a5de60e75c2b4984c9c9eefcaf56af49fc853737':
Add CTS for MediaSession.setActive()
9c4be8248eff51613f7c14b8b12df8f8f9d68612 09-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 84632bc0: am e2e7be85: am 6e1af134: am c2aee8e1: am d4c00849: am e96febd3: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev automerge: b7703ec

* commit '84632bc0a54c80a74ff2fda81385d1cca8e75747':
Add CTS for MediaBrowserService
8e2b1a12fd7a7be1b9da9f0d34c9cbb7917b7394 09-Jun-2015 Jean-Michel Trivi <jmtrivi@google.com> am 6796d056: am ee945108: Merge "Add tests for android.media.AudioAttributes\' implementation of Parcelable" into mnc-dev

* commit '6796d056ca510f8bc6780eacc8592c02c4f2f0a3':
Add tests for android.media.AudioAttributes' implementation of Parcelable
ee9451080c90ced53e83e8e08a77009030e5a681 09-Jun-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add tests for android.media.AudioAttributes' implementation of Parcelable" into mnc-dev
de932cafe8f78f269017bb7e45c5a133351449fc 09-Jun-2015 Jean-Michel Trivi <jmtrivi@google.com> Add tests for android.media.AudioAttributes' implementation of Parcelable

Bug 20732585

Change-Id: Iaeb0ce01a6dc389699bdd0f9190936e510e8f2a3
rc/android/media/cts/AudioAttributesTest.java
0eca01077b7eeb481d2e7a65238c2c2c96be8d3c 09-Jun-2015 Jean-Michel Trivi <jmtrivi@google.com> am 8ea45bf7: am c1c8530a: Merge "Add tests for android.media.AudioFormat and AudioFormat.Builder" into mnc-dev

* commit '8ea45bf7d3a7f507dba8b57a5a0d644c616abda8':
Add tests for android.media.AudioFormat and AudioFormat.Builder
3f4d51496ec1568d8af4123a18a6173cc7f51161 08-Jun-2015 Jean-Michel Trivi <jmtrivi@google.com> Add tests for android.media.AudioFormat and AudioFormat.Builder

Bug 20732585

Change-Id: Ieac10800054ca51834bead5d4906d2a808bb20dc
rc/android/media/cts/AudioFormatTest.java
861e46d04e8089c4d0a5ac3873f1ba3f7073a6cd 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 3bd35f46: am 13c764ca: am e9fad85b: am 2d61d530: am 4f916a85: Merge "Add more CTS for MediaController" into lollipop-cts-dev automerge: ccde590

* commit '3bd35f4679621195ade1aa4c26f7862775b61151':
Add more CTS for MediaController
a5de60e75c2b4984c9c9eefcaf56af49fc853737 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am d8f72887: am 796571df: am 6e017c1f: am fd342e0b: am 2ceb1c4c: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev automerge: 4aeb538

* commit 'd8f728876b86a4a60feb3425f2e0e410d8f5faea':
Add CTS for MediaSession.setActive()
84632bc0a54c80a74ff2fda81385d1cca8e75747 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am e2e7be85: am 6e1af134: am c2aee8e1: am d4c00849: am e96febd3: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev automerge: b7703ec

* commit 'e2e7be85028dc8d631dbbf5e9ed1f5b90765268e':
Add CTS for MediaBrowserService
13c764ca1cc1242dafd79ac2ac10578a74c934df 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am e9fad85b: am 2d61d530: am 4f916a85: Merge "Add more CTS for MediaController" into lollipop-cts-dev automerge: ccde590

* commit 'e9fad85b70161cace47117959d7a041d7c3baaf3':
Add more CTS for MediaController
796571df2718de0e2e5afc50c5c2b0fb76f252f7 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 6e017c1f: am fd342e0b: am 2ceb1c4c: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev automerge: 4aeb538

* commit '6e017c1fa950974ff7054daacc6bc8106ebf418f':
Add CTS for MediaSession.setActive()
6e1af13424d5740fcd9a7c4376836bc555d41221 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am c2aee8e1: am d4c00849: am e96febd3: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev automerge: b7703ec

* commit 'c2aee8e154e59a45d4e9d0f448b87730845cf6df':
Add CTS for MediaBrowserService
e9fad85b70161cace47117959d7a041d7c3baaf3 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 2d61d530: am 4f916a85: Merge "Add more CTS for MediaController" into lollipop-cts-dev automerge: ccde590

* commit '2d61d5306479fd25a2279929a6ccb3ebdaa20681':
Add more CTS for MediaController
6e017c1fa950974ff7054daacc6bc8106ebf418f 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am fd342e0b: am 2ceb1c4c: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev automerge: 4aeb538

* commit 'fd342e0b2d15344f71973d27ebfdfd7d11246681':
Add CTS for MediaSession.setActive()
c2aee8e154e59a45d4e9d0f448b87730845cf6df 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> am d4c00849: am e96febd3: Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev automerge: b7703ec

* commit 'd4c00849c723bb7cd474a226f70b0229c6ca134e':
Add CTS for MediaBrowserService
4f916a85da22eda154b10f01aed31f30549fcb65 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add more CTS for MediaController" into lollipop-cts-dev
automerge: ccde590

* commit 'ccde590a05032512d791a30989f7b946c3c2d22c':
Add more CTS for MediaController
2ceb1c4c776cf5d54be98ce0e0c0b6797d2c815f 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev
automerge: 4aeb538

* commit '4aeb538daf09e30dfa7dd544d4ed0831cd3a54df':
Add CTS for MediaSession.setActive()
e96febd31a00f024c475d065910d0ff93fb4c294 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaBrowserService" into lollipop-cts-dev
automerge: b7703ec

* commit 'b7703ecb90daed0fae60d9ae684074c7b70d9018':
Add CTS for MediaBrowserService
ccde590a05032512d791a30989f7b946c3c2d22c 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add more CTS for MediaController" into lollipop-cts-dev
4aeb538daf09e30dfa7dd544d4ed0831cd3a54df 08-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev
af4935fe512f19b4713436553c3ea3c480a16d7f 06-Jun-2015 Marco Nelissen <marcone@google.com> am b6f8ef14: am afcc574f: am a332a16e: am f9abc36a: am c66300a9: am b50e169e: am b7fba29a: am 9ec45237: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev automerge: c18e0e8

* commit 'b6f8ef145f677ade2675bed9488f2ec0859b7f97':
Use video without B frames for early EOS test
f5e62d4adfa5a6bd750bdac279b7467ad0208cf9 19-May-2015 Rachad <rachad@google.com> DO NOT MERGE: AudioTrack.write(...,timestamp) CTS test

Added CTS test for AudioTrack.write(ByteBuffer audioData,
int sizeInBytes,
@WriteMode int writeMode,
long timestamp);

Bug: 21281884
Change-Id: I9bc6bb112a7c9517be9dbb62604bb7ba4b764135
(cherry picked from commit c20af2fde6399c1ebbc938c2a85053e2d7037809)
rc/android/media/cts/CodecState.java
rc/android/media/cts/NonBlockingAudioTrack.java
afcc574f589bbe12846029537bd2e04d63bc793d 06-Jun-2015 Marco Nelissen <marcone@google.com> am a332a16e: am f9abc36a: am c66300a9: am b50e169e: am b7fba29a: am 9ec45237: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev automerge: c18e0e8

* commit 'a332a16e5277a4eaf82f2bd36b8943b5f1587ba5':
Use video without B frames for early EOS test
e9c7d2e58715dc315afae4328683cde601b68639 02-Jun-2015 Sungsoo Lim <sungsoo@google.com> Add more CTS for MediaController

Tests for volume controls and sending a command is implemented.

Bug: 21448958
Change-Id: Ie9b9aa946a3af51c4185eca3a7944073610ef268
rc/android/media/cts/MediaControllerTest.java
e7cf368a652d2152077681f90cd83d807892573c 04-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 03b69b8d: am 07049db2: am 2e4f475d: am dfc20640: am 6ce27b22: am 61893350: am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d

* commit '03b69b8dba64c247ca1be881dc145a1c200b3a38':
Add CTS for MediaController.TransportControls and its callback
07049db2e2bde004cd47d448276d5521f448a3a6 04-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 2e4f475d: am dfc20640: am 6ce27b22: am 61893350: am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d

* commit '2e4f475d1be4aec8c605bdf9b6232149c81b7bba':
Add CTS for MediaController.TransportControls and its callback
a332a16e5277a4eaf82f2bd36b8943b5f1587ba5 04-Jun-2015 Marco Nelissen <marcone@google.com> am f9abc36a: am c66300a9: am b50e169e: am b7fba29a: am 9ec45237: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev automerge: c18e0e8

* commit 'f9abc36a6ec665d0c461b7eba28c8f0d913fa11a':
Use video without B frames for early EOS test
151381d12c113efc753e42851b41e413dbd8bf12 26-May-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaBrowserService

Bug: 21448958
Change-Id: I8864997f8ed3459a64533fb297384402b4d1efd1
rc/android/media/cts/MediaBrowserServiceTest.java
rc/android/media/cts/MediaBrowserTest.java
rc/android/media/cts/StubMediaBrowserService.java
c66300a97fd89f7e2c7378b02869d0163c4fb6f8 04-Jun-2015 Marco Nelissen <marcone@google.com> am b50e169e: am b7fba29a: am 9ec45237: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev automerge: c18e0e8

* commit 'b50e169ebc96ab0c5c0e6717dc4da7e6f0f7ff71':
Use video without B frames for early EOS test
c50f5db21a3de1d12d1fd96087b3fee5f7535379 04-Jun-2015 Jeff Tinker <jtinker@google.com> am ffdb1465: am 1ca992ee: Merge "Add cts coverage for new APIs in M" into mnc-dev

* commit 'ffdb1465094025b616e53bfffcd80fc44d1dcfb4':
Add cts coverage for new APIs in M
c904e296ba15a33da34e0aeb37c0645e0ef7a499 04-Jun-2015 Paul McLean <pmclean@google.com> am c965d8ed: am 4a698d63: Merge "Fix up Looper preparation." into mnc-dev

* commit 'c965d8ed673fbec1c3f04782848c8ff819fdc8bf':
Fix up Looper preparation.
72fcb259178b4a72ac7c2212aa118aab1201ba33 04-Jun-2015 Paul McLean <pmclean@google.com> am 3e6bc59f: am bfcea7e3: Testing AudioDeviceInfo.getId()

* commit '3e6bc59fbfdf9e8448cbfe033abfcc637377c87b':
Testing AudioDeviceInfo.getId()
5bdabcfbf6322896bfbe19666cb7a45d5d3e141d 04-Jun-2015 Paul McLean <pmclean@google.com> am bd6e4d7c: am 71939129: Merge "Add test for AudioRecord.getRoutedDevice()" into mnc-dev

* commit 'bd6e4d7c91e9c9ffed3e78d9dce183575728c92c':
Add test for AudioRecord.getRoutedDevice()
b50e169ebc96ab0c5c0e6717dc4da7e6f0f7ff71 03-Jun-2015 Marco Nelissen <marcone@google.com> am b7fba29a: am 9ec45237: Merge "Use video without B frames for early EOS test" into lollipop-cts-dev automerge: c18e0e8

* commit 'b7fba29a25fa92fb73a2b44850e1b5e8871fb9e2':
Use video without B frames for early EOS test
1ca992eeb6c6071a6c2bab2c7ae5d1e6c34acc08 03-Jun-2015 Jeff Tinker <jtinker@google.com> Merge "Add cts coverage for new APIs in M" into mnc-dev
616ba550351ef7a50076263f113e341fa41d7f0f 03-Jun-2015 Paul McLean <pmclean@google.com> Fix up Looper preparation.

bug: 21473342

Change-Id: I1086938f9fa8c7de482eeb1391a75c668e8b6fe1
rc/android/media/cts/EnumDevicesTest.java
rc/android/media/cts/RoutingTest.java
cc61c1629b9ed546a5db5880fcf77518426b2c50 03-Jun-2015 Paul McLean <pmclean@google.com> am 7570ce0b: am 5be699f0: Merge "Testing audioTrack.getRoutedDevice()" into mnc-dev

* commit '7570ce0b84598d36302ef4f45253c2f4854873a5':
Testing audioTrack.getRoutedDevice()
9ec4523788ce3a6ae306e72cacf5b1563922c5be 03-Jun-2015 Marco Nelissen <marcone@google.com> Merge "Use video without B frames for early EOS test" into lollipop-cts-dev
automerge: c18e0e8

* commit 'c18e0e89dcfe415b58d260d1e458d7b23dec784f':
Use video without B frames for early EOS test
50a3276014e87a9edb672589d9a9af9de927ea39 03-Jun-2015 Marco Nelissen <marcone@google.com> Use video without B frames for early EOS test

Bug: 18290718
Change-Id: Ic60035b192a9f91daf41eb0f5c25bc0480798908
rc/android/media/cts/DecoderTest.java
bfcea7e31c05c52ea39254988e11498d13d7f80c 03-Jun-2015 Paul McLean <pmclean@google.com> Testing AudioDeviceInfo.getId()

Change-Id: Ied4d3af0534a910dd6a4282ea2a8c2dce1017d8f
rc/android/media/cts/EnumDevicesTest.java
5d9410f3c7c32385650c18b994f5c8fca2b5841b 03-Jun-2015 Paul McLean <pmclean@google.com> Add test for AudioRecord.getRoutedDevice()

Change-Id: If5a43e76fa545f79fa36d83311e56fbaecacf904
rc/android/media/cts/RoutingTest.java
8734acb91a8a7c2a6cc4a26854bf2cc2e0bd86cf 03-Jun-2015 Paul McLean <pmclean@google.com> Testing audioTrack.getRoutedDevice()

Change-Id: I02ca769d7315258ede9d86c74528d8b14690c1b2
rc/android/media/cts/RoutingTest.java
7f8f603571cc7f35f7119e3f6b18897e57793406 02-Jun-2015 Paul McLean <pmclean@google.com> am 241c61e1: am 5e9b5c4f: CTS test unregisterAudioDeviceCallback.

* commit '241c61e1ef9e0fa1810095bfd32879251a48a71e':
CTS test unregisterAudioDeviceCallback.
0ed4a7d5052b82a7b2ee94074cfcdde27eeafc09 02-Jun-2015 Paul McLean <pmclean@google.com> am 03938a12: am b98a50ea: Merge "Added tests for (re)Routing callbacks." into mnc-dev

* commit '03938a1257fae8e5eac9fdc5a7ffe975284ba7e7':
Added tests for (re)Routing callbacks.
5e9b5c4f27ee86a48af31068144504d155575616 02-Jun-2015 Paul McLean <pmclean@google.com> CTS test unregisterAudioDeviceCallback.

Change-Id: Ib81a1855b8c37d092fc013e7719d305297da552b
rc/android/media/cts/EnumDevicesTest.java
4333788f2d0e33defc9c06f0576f283707475659 02-Jun-2015 Paul McLean <pmclean@google.com> am 4bbb1513: am f116e572: Merge "Added CTS tests for AudioDeviceInfo accessors." into mnc-dev

* commit '4bbb15137ba493fbe841d53d086568dee92537fe':
Added CTS tests for AudioDeviceInfo accessors.
b98a50eaa289c762546c1daa2e89e91c2b77a679 02-Jun-2015 Paul McLean <pmclean@google.com> Merge "Added tests for (re)Routing callbacks." into mnc-dev
ea1845ef2b57e042c25f27ca3b59fc33bb7e85a5 02-Jun-2015 Paul McLean <pmclean@google.com> Added tests for (re)Routing callbacks.

Change-Id: I31dbf1c59e1b12644a5d1f6f9c48bef6a146a9cd
rc/android/media/cts/RoutingTest.java
2e4f475d1be4aec8c605bdf9b6232149c81b7bba 02-Jun-2015 Sungsoo Lim <sungsoo@google.com> am dfc20640: am 6ce27b22: am 61893350: am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d

* commit 'dfc206401c250e7eb390f33c5e6e255eea7b1e70':
Add CTS for MediaController.TransportControls and its callback
6ce27b22ddccf11c3d26fa98d2cb4ab1e4dbe748 02-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 61893350: am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d

* commit '618933504a39857e437aa64ccb201a53f2e48a8f':
Add CTS for MediaController.TransportControls and its callback
618933504a39857e437aa64ccb201a53f2e48a8f 02-Jun-2015 Sungsoo Lim <sungsoo@google.com> am bba1edf7: am e45eaab1: Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev automerge: 62f111d

* commit 'bba1edf72f43f2abe0b662e78c77d68f8c89a0f8':
Add CTS for MediaController.TransportControls and its callback
f116e57270e667302f61f86eba543dc94d9a47e6 02-Jun-2015 Paul McLean <pmclean@google.com> Merge "Added CTS tests for AudioDeviceInfo accessors." into mnc-dev
1aa0fc3dd9cc7df182d97352cc9f5d679752a930 02-Jun-2015 Paul McLean <pmclean@google.com> Added CTS tests for AudioDeviceInfo accessors.

Change-Id: I70b07b7977e001829f780ded0bc4eceb75208830
rc/android/media/cts/EnumDevicesTest.java
e45eaab1aa72b70b434c92746d5c81918d6c902c 02-Jun-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaController.TransportControls and its callback" into lollipop-cts-dev
automerge: 62f111d

* commit '62f111d0b514ae129e57859da0708654751a4bf1':
Add CTS for MediaController.TransportControls and its callback
c7c906e95861f53d2fa204c2188f790b06677c1f 01-Jun-2015 Phil Burk <philburk@google.com> am 8100067e: am ac3a86c1: Merge "MidiCTS: test new MIDI API without devices" into mnc-dev

* commit '8100067ea837cbfed4b6411b7678c8e67215f1e9':
MidiCTS: test new MIDI API without devices
ac3a86c130ed0014af192c8f38be921698ba479a 01-Jun-2015 Phil Burk <philburk@google.com> Merge "MidiCTS: test new MIDI API without devices" into mnc-dev
bd7d18bf52fec7f56dd80485e5fbcb0056c822a4 01-Jun-2015 Jae Seo <jaeseo@google.com> am 195397d9: am 2c38ebf5: Merge "media: add missing CTS tests for PlaybackParams - Parcelable methods" into mnc-dev

* commit '195397d9e973a14039568b8f81a3a9c3b16bc942':
media: add missing CTS tests for PlaybackParams - Parcelable methods
1ea2f1ee8dd9ef21a82de334a9ce3559bb539fe7 01-Jun-2015 Sungsoo Lim <sungsoo@google.com> am 0ff5835b: am 629b2e7f: Merge "Add CTS for MediaSession.sendSessionEvent()" into mnc-dev

* commit '0ff5835bb834000344e697147fd864c2eec341f9':
Add CTS for MediaSession.sendSessionEvent()
b87d4d58864466865a65dacf322f792d6f7800e6 29-May-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaController.TransportControls and its callback

Bug: 21448958
Change-Id: I07d850a3a2796595991b4a763bced5047c6c1c88
rc/android/media/cts/MediaControllerTest.java
2d6b99425349989009dd9ac107b3223f0d7876ee 29-May-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaSession.setActive()

Bug: 21448958
Change-Id: Icea1fc5c3afc7cfdad1ce4b5b3c8d64dbe2e60c6
rc/android/media/cts/MediaSessionTest.java
b1b956b9487648571c5b72b5901720e84220b756 16-May-2015 Jeff Tinker <jtinker@google.com> Add cts coverage for new APIs in M

bug: 21527003

Change-Id: I5e7d730f8455dd16005edac8d2f8c84573a0acb5
rc/android/media/cts/MediaCodecCencPlayer.java
2c38ebf5ce7ca264448b02b27767165cc4d8fe49 29-May-2015 Jae Seo <jaeseo@google.com> Merge "media: add missing CTS tests for PlaybackParams - Parcelable methods" into mnc-dev
cf55171ce02134b97d06ac138e40c470ad444163 22-May-2015 Phil Burk <philburk@google.com> MidiCTS: test new MIDI API without devices

Change-Id: I88e4210946e59f7a0fc4d304cac525cace274c6b
Signed-off-by: Phil Burk <philburk@google.com>
rc/android/media/cts/MidiSoloTest.java
743dc299ed1ee372fcb4448548632be2bce38d37 28-May-2015 Jae Seo <jaeseo@google.com> media: add missing CTS tests for PlaybackParams - Parcelable methods

Bug: 21473840
Change-Id: Iccc06e45d23f58db1b822273c2da2cacd478e004
rc/android/media/cts/ParamsTest.java
2f901cebfcce7d0add9ba1d91093f419b8d0dcd4 28-May-2015 Nicholas Sauer <nicksauer@google.com> am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev
automerge: cbbfd90

* commit 'cbbfd900357ca52276df9d98b1ac25cdc593f278':
Update Android CTS bandaid urls that use test_key1 to a new key
6c4b47ffbd69cc66d8f6ba4ca3d014289e4dc006 28-May-2015 Nicholas Sauer <nicksauer@google.com> am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev
automerge: a15ba0e

* commit 'a15ba0e78092f464b6785ff60e9deea24cd35b72':
Update Android CTS bandaid urls that use test_key1 to a new key
9f02f1a3221b0192a51663b23833583bce92d62d 28-May-2015 Marco Nelissen <marcone@google.com> am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev
automerge: 430eeb7

* commit '430eeb70a70bea7b79a7298b9f883aed645637c2':
Fix test
1a174fc3736fb60d33a76c84cd830e5ceb3ae5b4 28-May-2015 Marco Nelissen <marcone@google.com> am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev
automerge: 869d252

* commit '869d25245ecb5af27fc6cc123897b7665b254816':
Add tests for midi playback
14e48ed58b2692594617b662bc1c821c7265d7d4 28-May-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaSession.sendSessionEvent()

Bug: 21448958
Change-Id: I98273a259e11f17c2ddb504000aec3d97a838eec
rc/android/media/cts/MediaSessionTest.java
6546b4a0f7fa999c7d7264f5fb3aed5725e382e9 28-May-2015 Rachad <rachad@google.com> Merge "AudioTrack.write(...,timestamp) CTS test"
3dd9e09783ac33852461b975dfecf70582b6dea4 27-May-2015 Sungsoo Lim <sungsoo@google.com> am 5e195d2e: am e7464b58: am c5fda941: am f0f1d16b: am 2d9c2894: am ec4b77b7: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev automerge: 6d4a6d3

* commit '5e195d2ee00c69edba44c33535dad1c2c8da0646':
Add more CTS codes for MediaBrowserTest
1613d3eb366937cfedf9607e51bc660631c81749 27-May-2015 Sungsoo Lim <sungsoo@google.com> am a5a95571: am 41f121f8: am bcbaab28: am 979b382c: am a1e639c0: am 46976b72: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev automerge: 32e17d4

* commit 'a5a95571d5b1f110f5a1a62affd0d87090f52e9c':
Add CTS for MediaSession.Token
5e195d2ee00c69edba44c33535dad1c2c8da0646 27-May-2015 Sungsoo Lim <sungsoo@google.com> am e7464b58: am c5fda941: am f0f1d16b: am 2d9c2894: am ec4b77b7: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev automerge: 6d4a6d3

* commit 'e7464b58096d0b3ecae6f54c3487fd0980e18760':
Add more CTS codes for MediaBrowserTest
a5a95571d5b1f110f5a1a62affd0d87090f52e9c 27-May-2015 Sungsoo Lim <sungsoo@google.com> am 41f121f8: am bcbaab28: am 979b382c: am a1e639c0: am 46976b72: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev automerge: 32e17d4

* commit '41f121f8d22b709d688cb20d5e3927055a503519':
Add CTS for MediaSession.Token
c5fda9411b335eda6511892bafe13bc34342a878 27-May-2015 Sungsoo Lim <sungsoo@google.com> am f0f1d16b: am 2d9c2894: am ec4b77b7: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev automerge: 6d4a6d3

* commit 'f0f1d16b5b4bcbe73e7be30feb04c78a5da2e40c':
Add more CTS codes for MediaBrowserTest
bcbaab283f48990f8b0be14f4136bbada6761111 27-May-2015 Sungsoo Lim <sungsoo@google.com> am 979b382c: am a1e639c0: am 46976b72: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev automerge: 32e17d4

* commit '979b382c338e6f3330c6699b21efbcf7a9523718':
Add CTS for MediaSession.Token
f0f1d16b5b4bcbe73e7be30feb04c78a5da2e40c 27-May-2015 Sungsoo Lim <sungsoo@google.com> am 2d9c2894: am ec4b77b7: Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev automerge: 6d4a6d3

* commit '2d9c28943f556acb990958c94a2d5a9f4b926031':
Add more CTS codes for MediaBrowserTest
979b382c338e6f3330c6699b21efbcf7a9523718 27-May-2015 Sungsoo Lim <sungsoo@google.com> am a1e639c0: am 46976b72: Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev automerge: 32e17d4

* commit 'a1e639c06b3164ae29f2c64f8d131c212e19822b':
Add CTS for MediaSession.Token
ec4b77b7d62cfa4419d8cab39b12a5657600f587 27-May-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev
automerge: 6d4a6d3

* commit '6d4a6d3e6c84da6d05ac55aa3dbe65ab02bdb7ee':
Add more CTS codes for MediaBrowserTest
46976b72aae160871ed2485a132a564aef5d37a5 27-May-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaSession.Token" into lollipop-cts-dev
automerge: 32e17d4

* commit '32e17d400bd54f6ef5ea9e44c81cd51c5c41a427':
Add CTS for MediaSession.Token
6d4a6d3e6c84da6d05ac55aa3dbe65ab02bdb7ee 27-May-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add more CTS codes for MediaBrowserTest" into lollipop-cts-dev
807cd0f8fef5e850eaabf5235b9fddaea2ef5ddc 27-May-2015 Wei Jia <wjia@google.com> MediaPlayerTest: use getAnchorSytemNanoTime() instead of raw field.

Change-Id: I1bc9654c4fd0dc065a73de79acc9e473afbfacda
rc/android/media/cts/MediaPlayerTest.java
0e380fe74ca77952ed922f5f2e47e499378a4507 22-May-2015 Sungsoo Lim <sungsoo@google.com> Add more CTS codes for MediaBrowserTest

- Check onConnectionFailed() in ConnectionCallback is called
when the connection is failed.
- Test MediaBrowser.subscribe() and SubscriptionCallback.

Change-Id: I4724607294a9c56212df80498fb64e5abe821645
rc/android/media/cts/MediaBrowserTest.java
rc/android/media/cts/StubMediaBrowserService.java
0921401ae355f93f2a9ac001775e4529a637b05b 26-May-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaSession.Token

Change-Id: Idbc724be9f3ba23bf269f8aeda2d5c02275f1da9
rc/android/media/cts/MediaSessionTest.java
9dd56edf1166be6ab1c1d90bfb5dae8e9a3f363e 26-May-2015 Sungsoo Lim <sungsoo@google.com> am c18ea7ff: am a7c01772: am f2802742: am 9af3603a: am 61807e2f: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev automerge: 71a8a6d

* commit 'c18ea7ff27ea2a464768f6030461caa34be0ff2d':
Add CTS for MediaBrowser
3254301d95df2710e594b29865e729707f60d32e 26-May-2015 Sungsoo Lim <sungsoo@google.com> am f594e057: am cd7f02ff: am 3b379f3b: am ea3949a0: am 72e627f9: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev automerge: 6585d2a

* commit 'f594e057cbf3652e034b227511be6de931e470b5':
Add CTS for MediaBrowser.MediaItem
c18ea7ff27ea2a464768f6030461caa34be0ff2d 26-May-2015 Sungsoo Lim <sungsoo@google.com> am a7c01772: am f2802742: am 9af3603a: am 61807e2f: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev automerge: 71a8a6d

* commit 'a7c0177200cbbd34f9931e632211edff918740be':
Add CTS for MediaBrowser
f594e057cbf3652e034b227511be6de931e470b5 26-May-2015 Sungsoo Lim <sungsoo@google.com> am cd7f02ff: am 3b379f3b: am ea3949a0: am 72e627f9: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev automerge: 6585d2a

* commit 'cd7f02ffe61e073f7a021f76d9f7c9a4babd057e':
Add CTS for MediaBrowser.MediaItem
a7c0177200cbbd34f9931e632211edff918740be 26-May-2015 Sungsoo Lim <sungsoo@google.com> am f2802742: am 9af3603a: am 61807e2f: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev automerge: 71a8a6d

* commit 'f28027421c0c886e121c2ae4abd97327be0a0072':
Add CTS for MediaBrowser
cd7f02ffe61e073f7a021f76d9f7c9a4babd057e 26-May-2015 Sungsoo Lim <sungsoo@google.com> am 3b379f3b: am ea3949a0: am 72e627f9: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev automerge: 6585d2a

* commit '3b379f3ba42ba4d6e56bd474f15b7d9dad9bbb79':
Add CTS for MediaBrowser.MediaItem
f28027421c0c886e121c2ae4abd97327be0a0072 26-May-2015 Sungsoo Lim <sungsoo@google.com> am 9af3603a: am 61807e2f: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev automerge: 71a8a6d

* commit '9af3603a8cfed65d54f803f18eb731ad8509b3d6':
Add CTS for MediaBrowser
3b379f3ba42ba4d6e56bd474f15b7d9dad9bbb79 26-May-2015 Sungsoo Lim <sungsoo@google.com> am ea3949a0: am 72e627f9: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev automerge: 6585d2a

* commit 'ea3949a06f3e58f04db3155d2c17fe168eaeaaf1':
Add CTS for MediaBrowser.MediaItem
61807e2f062a06a3069b2e922fa7c41a1011a006 26-May-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaBrowser" into lollipop-cts-dev
automerge: 71a8a6d

* commit '71a8a6d73a8132d33fab9824a3c7bae954ede4ec':
Add CTS for MediaBrowser
72e627f90b6ffb25faa1d6ffdfdbe16fa83734fe 26-May-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev
automerge: 6585d2a

* commit '6585d2a763342db3c7577736b07805f8ccd6235d':
Add CTS for MediaBrowser.MediaItem
71a8a6d73a8132d33fab9824a3c7bae954ede4ec 26-May-2015 Sungsoo Lim <sungsoo@google.com> Merge "Add CTS for MediaBrowser" into lollipop-cts-dev
ff1189299b5cad6ae5140cdf14741b9e908fef1a 23-May-2015 Chong Zhang <chz@google.com> Merge "cts: specify timeout for MediaPlayerFlakyNetworkTest" into mnc-dev
025154546307d41a3671e86b95a087eaa8982edd 23-May-2015 Chong Zhang <chz@google.com> cts: specify timeout for MediaPlayerFlakyNetworkTest

bug: 20858729
Change-Id: I204914e7b45314e160d70dd2159edef38140cb6a
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
f3e13db68b92e0f551c87b1e7a753e301141aa20 22-May-2015 Paul McLean <pmclean@google.com> Merge "First CTS tests for Enum/Notify/Select & (re)Routing API" into mnc-dev
fed98f4d301501cdbd6a409cbdf715c4062d2591 21-May-2015 Paul McLean <pmclean@google.com> First CTS tests for Enum/Notify/Select & (re)Routing API

Change-Id: Ic84842a014caf1b1ef5d38620801ee1baa3fd2a5
rc/android/media/cts/EnumDevicesTest.java
rc/android/media/cts/RoutingTest.java
a59f4edd859d60b2554597973ebaa6ed19dd171e 19-May-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaBrowser

Change-Id: Idfbedb14fec08f61cb5d2717030913bc2c0ef83c
ndroidManifest.xml
rc/android/media/cts/MediaBrowserTest.java
rc/android/media/cts/StubMediaBrowserService.java
d7c7ec16acae8684f2b9fcb0f8d9a2f6a63412e6 20-May-2015 Sungsoo Lim <sungsoo@google.com> Add CTS for MediaBrowser.MediaItem

Change-Id: Ice2d665c55e1ca4c761beef5615357746903509b
rc/android/media/cts/MediaItemTest.java
7405d5215f77316bbd1a265ec98fcff62075d46a 20-May-2015 Andy Hung <hunga@google.com> Update CTS tests for API review changes

Bug: 21304902
Bug: 20887665
Change-Id: I9341d338ebb55bbfd4484bb74ca9e3dbd261f13f
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
c20af2fde6399c1ebbc938c2a85053e2d7037809 19-May-2015 Rachad <rachad@google.com> AudioTrack.write(...,timestamp) CTS test

Added CTS test for AudioTrack.write(ByteBuffer audioData,
int sizeInBytes,
@WriteMode int writeMode,
long timestamp);

Bug: 21281884
Change-Id: I9bc6bb112a7c9517be9dbb62604bb7ba4b764135
rc/android/media/cts/CodecState.java
rc/android/media/cts/NonBlockingAudioTrack.java
ac9ade554b77455ba51295d17668f78141ca035f 20-May-2015 Andy Hung <hunga@google.com> Merge "Improve SoundPoolTest" into mnc-dev
66f2eb8da0252e2a18ae78b405ee99c1b6fc1f45 19-May-2015 Wei Jia <wjia@google.com> Merge "MediaSyncTest: fix a typo." into mnc-dev
ee22dd1c3b9f2a62201ae32b15bcd7f3c27a92f7 19-May-2015 Wei Jia <wjia@google.com> MediaSyncTest: fix a typo.

Bug: 21045118
Change-Id: If41120aa0d43066add79d450caca226bf6e09750
rc/android/media/cts/MediaSyncTest.java
a4b809b069bddb2a2e9a1e18b9ff67d9238c5b0c 16-May-2015 Andy Hung <hunga@google.com> Improve SoundPoolTest

Add tests for SoundPool Builder, autoPause, autoResume,
and setOnLoadCompleteListener.

Bug: 18446245
Bug: 21134712
Change-Id: Ie37812076c8f8e0148edc294b1072cfacfd8084e
rc/android/media/cts/SoundPoolTest.java
8e89c3d107e16d9a8d56e9bbf7c2cef261ded6f3 16-May-2015 Lajos Molnar <lajos@google.com> media: add minimal test for setSyncParams

For now only default params must work, and we must take the sync
tolerance into account in our tests, except in the case when MediaSync
is not yet configured (where tolerance must be 0.)

Bug: 21211755
Change-Id: Ic934c7f841c64cb0a8f65830eb76c2c2bc7c7797
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaSyncTest.java
9ffb424798bc47e22ff047f5d6424769711d59ac 16-May-2015 Lajos Molnar <lajos@google.com> media: add CTS tests for PlaybackParams and SyncParams

Bug: 21134712
Bug: 20922063
Bug: 20887706
Change-Id: I9bd962536fba9c08a9870c0d31939150695694e2
rc/android/media/cts/ParamsTest.java
d6c900740a6f68201cf8e6186dbf5e78f259d3b0 16-May-2015 Lajos Molnar <lajos@google.com> media: test MediaCodec.setOutputSurface

Add minimal test cases for now

Bug: 21211310
Change-Id: I5d1974027a85ddb8cd74f2b0c94e78f98f3a2738
rc/android/media/cts/AdaptivePlaybackTest.java
d90242be770c73040b5813d3b2988ffbcb3e503f 16-May-2015 Chong Zhang <chz@google.com> Merge "cts: release muxer objects in MediaMuxerTest" into mnc-dev
340b5c214a1421707addb85ebf8f187199176951 16-May-2015 Andy Hung <hunga@google.com> Merge "Add CTS test for synchronized AudioRecord" into mnc-dev
52424e00ffa161e20f56b50ce018b7f15445349d 16-May-2015 Chong Zhang <chz@google.com> cts: release muxer objects in MediaMuxerTest

bug: 20858729
Change-Id: Ieb4cc7d7821e0ce0b7ebfcfbdbf327d8c099cc1b
rc/android/media/cts/MediaMuxerTest.java
da565a0322a2269e38453d82617cb0703ba42997 15-May-2015 Andy Hung <hunga@google.com> Add CTS test for synchronized AudioRecord

Also test MediaSyncEvent.

Bug: 21134712
Change-Id: I9cab4c40ac5adebb4ab09b3240d851efb425576e
rc/android/media/cts/AudioRecordTest.java
e7c50aba7b8c573a590698a2fc95bbfd8fc10951 16-May-2015 Jeff Tinker <jtinker@google.com> Merge "MediaDrm API Updates per api council review" into mnc-dev
ef3abdb5919db6aa38386452175fe1633b134136 16-May-2015 Andy Hung <hunga@google.com> Merge "Move sine wave and chirp sound data creation to AudioHelper" into mnc-dev
781c7b570e1f37b38489a85dbe470e6287fd24af 15-May-2015 Andy Hung <hunga@google.com> Move sine wave and chirp sound data creation to AudioHelper

Bug: 21134712
Change-Id: I0c1a48fdc355f2de07c275198af7d5ddf3720a47
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
9ecce296e4a3d8e24d85cace895bd30f4ea56fc2 16-May-2015 Andy Hung <hunga@google.com> Merge "Improve AudioTrack and AudioRecord CTS coverage" into mnc-dev
78676df782593b21b2c69e04604288b793d292bf 16-May-2015 Wei Jia <wjia@google.com> Merge "MediaPlayerTest: add test for getTimestamp()." into mnc-dev
581ea15d6b917d99c210ce592333f42df8d26080 15-May-2015 Andy Hung <hunga@google.com> Improve AudioTrack and AudioRecord CTS coverage

Bug: 21134712
Change-Id: Icc0655852f335be53d6bd6135f5d57694461de58
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
bbb3f9cf0b26af358560167799836bb016d83f7a 12-May-2015 Chong Zhang <chz@google.com> cts: add test for MediaRecorder setInputSurface/getInputSurface

Bug: 19127604
Bug: 19489395

Change-Id: I3b8e9272d27921229d92499c17ac49b5b3c2dfaf
rc/android/media/cts/MediaRecorderTest.java
0369e341c58ce683714a4ce2181dad0755e9f4f9 14-May-2015 Jeff Tinker <jtinker@google.com> MediaDrm API Updates per api council review

bug: 21044671

Change-Id: I2bfbd0f29be0b2309cb1c1421252c998e2fc4829
rc/android/media/cts/MediaDrmMockTest.java
b66cec142aa30a9fd5e632e463861f44f20b6161 12-May-2015 Wei Jia <wjia@google.com> MediaPlayerTest: add test for getTimestamp().

Change-Id: I9d99a4cac32c743f93b6ca81d84b569bb2b07910
rc/android/media/cts/MediaPlayerTest.java
44f9156b7aabd350a49925f118535d35c730fb8f 15-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: cts for media resource manager." into mnc-dev
21fa554b882449bd047f9e5e430d4904d38851e7 14-May-2015 Chong Zhang <chz@google.com> Merge "cts: MediaDataSource API change" into mnc-dev
37098c4eedf221c7f219f76094d94a230370f9b2 14-May-2015 Chong Zhang <chz@google.com> cts: MediaDataSource API change

bug: 21045118
Change-Id: If656a4429f0b0017d355bb9afcdf4870630b16c4
rc/android/media/cts/MediaExtractorTest.java
rc/android/media/cts/MediaMetadataRetrieverTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/TestMediaDataSource.java
34a0f63071d5ee96f8db3fa02f672fd6081eb4ef 14-May-2015 Lajos Molnar <lajos@google.com> media: update setPlaybackRate to setPlaybackParams

Bug: 21045118
Change-Id: Ic96a88ae51c228d9d2399f7601a6296123d3b6ce
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaSyncTest.java
b28e0fe778e22178db41ebb5ba42fa1e5db96eba 13-May-2015 Robert Shih <robertshih@google.com> testPlayHlsStreamWithTimedId3: use updated API names

Update API calls to match the changes by commit b7514effd1b77829fb950f4fab22041f98b2075f in frameworks/base.

Bug: 21045118
Change-Id: Ibff6a3603f5bf2fcb1bdbe7035c5d8f702508a71
rc/android/media/cts/StreamingMediaPlayerTest.java
369761461a19e9319683ad5eabec610a2b8bc747 13-May-2015 Chong Zhang <chz@google.com> Merge "cts: rename usePersistentInputSurface to setSurface" into mnc-dev
3661c332d662c675dd1d36963e42037fd35bd681 13-May-2015 Chong Zhang <chz@google.com> cts: rename usePersistentInputSurface to setSurface

bug: 21045402
Change-Id: Ifac05e0986975338bab1d47db5dca3d7e1bfc7b8
rc/android/media/cts/EncodeDecodeTest.java
0a2d3ee8e6fb3823dd2a232d3e676416e2477a29 12-May-2015 Wei Jia <wjia@google.com> MediaSyncTest: add test for flush().

Change-Id: If5ad7db3cb142fad5fd8596c4b1259a2fba8051c
rc/android/media/cts/MediaSyncTest.java
ece56c976e34a55de26135e0ffc5ee15ad6a60f9 13-May-2015 Jean-Michel Trivi <jmtrivi@google.com> More AudioRecord.Builder tests

Test AudioRecord state after each Builder test.
Test configuring builder and get settings from built instance.

Bug 20732585

Change-Id: Ifc898b5c9b74abd66eb2a20fb068f09862e48774
rc/android/media/cts/AudioRecordTest.java
a961c73b4ffa3e39bfc1071ec9af9ee15c50e96a 13-May-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Add android.media.AudioRecord.Builder tests" into mnc-dev
c1a78c89f56369d0ee9e9a327fe22e778e985ca4 12-May-2015 Robert Shih <robertshih@google.com> Merge "Added testPlayHlsStreamWithTimedId3" into mnc-dev
970b1084ccf985b760a6bd18496e76c6b48cde1b 08-May-2015 Robert Shih <robertshih@google.com> Added testPlayHlsStreamWithTimedId3

Tests timed Id3 related APIs: setOnTimedMetaDataListener/onTimedMetaData.

Bug: 21003308
Change-Id: I3591ebba168e16a92b0688ef270e5d87e9fce029
ssets/fileSequence0.ts
ssets/fileSequence1.ts
ssets/prog_index.m3u8
rc/android/media/cts/StreamingMediaPlayerTest.java
658286f62a4126baa89ee352162303babc7c8900 15-Apr-2015 Ronghua Wu <ronghuawu@google.com> media: cts for media resource manager.

Change-Id: Id83dc3e2902944bbd6102804a706f2f86ed182e9
ndroidManifest.xml
rc/android/media/cts/ResourceManagerStubActivity.java
rc/android/media/cts/ResourceManagerTest.java
rc/android/media/cts/ResourceManagerTestActivity1.java
rc/android/media/cts/ResourceManagerTestActivity2.java
rc/android/media/cts/ResourceManagerTestActivityBase.java
a96eac2dac2ba61c021685f6e7a7fa3d235a972c 08-May-2015 Jean-Michel Trivi <jmtrivi@google.com> Add android.media.AudioRecord.Builder tests

Test AudioRecord.Builder to verify the observed configuration of an
AudioRecord built with an empty Builder matches the documentation.
Test AudioRecord.Builder to verify the observed configuration of an
AudioRecord built with an incomplete AudioFormat matches the
documentation.

Bug 246391

Change-Id: I6b895b2b00ad4ee7b5918fa28a3ada243c786a2c
rc/android/media/cts/AudioRecordTest.java
0d99e6cf08fdc86107a7ce045b6ad36ad60d0446 09-May-2015 Wei Jia <wjia@google.com> Merge "MediaSyncTest/AudioTrackTest: corresonding change of API." into mnc-dev
2260475af38b32e0b6ba3cddc18200be9780210f 09-May-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: cts for CodecCapabilities.getMaxSupportedInstances." into mnc-dev
86ab058d83a88d2fab32670500f3243f4167f47b 09-May-2015 Wei Jia <wjia@google.com> MediaSyncTest/AudioTrackTest: corresonding change of API.

Bug: 20887706
Change-Id: If4717f9414b5db6f5e9ca516711534990c500460
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/MediaSyncTest.java
c3fc0c1e95e0eaa19b573c1709183f51e616e619 14-Apr-2015 Ronghua Wu <ronghuawu@google.com> media: cts for CodecCapabilities.getMaxSupportedInstances.

Bug: 19620911
Change-Id: Ice7d653e0016b4f5e2d90261eed10b06a8838cf8
rc/android/media/cts/MediaCodecCapabilitiesTest.java
b164742cc2a48d4df4af5a2348d48f605ebed561 03-Apr-2015 Jean-Michel Trivi <jmtrivi@google.com> Exercise android.media.AudioTrack.Builder

Test creating an AudioTrack with its builder.
Test default builder settings, AudioFormat, sessionID.
Test AudioAttributes

Bug 19699343

Change-Id: I2f2d1b059ab3251cf965209755310e5dcca8e42a
rc/android/media/cts/AudioTrackTest.java
6e61740bfef2efd615a5761cd360621df493ca20 05-May-2015 Andy Hung <hunga@google.com> Merge "Fix AudioRecord_BufferSizeTest" into mnc-dev
fab5b16079aa549caaf65f1b95ff98c3edbd98ec 05-May-2015 Andy Hung <hunga@google.com> Fix AudioRecord_BufferSizeTest

1) RecordingState changes are performed synchronously, no need to poll.
2) getRecordingState() returns AudioRecord.RECORDSTATE_STOPPED after creation.
3) Clean up by releasing AudioRecords if there is an exception.

Change-Id: I6e98e5100a9d413ddfee04d91d7582b505bd37d1
rc/android/media/cts/AudioRecord_BufferSizeTest.java
6640c1ba022c5d5407cdb3c3a59ed224b7c35dea 02-May-2015 Lajos Molnar <lajos@google.com> Merge "MediaPlayerTest: explicitly place external tracks after internal ones" into mnc-dev
93e51b6ca156ad9d5ab4559fd7a49cd071a2f3a2 02-May-2015 Chong Zhang <chz@google.com> Merge "cts: add test for persistent input surface" into mnc-dev
909359995d48d51c1a14f616f8a0bb774f732997 26-Nov-2014 Andy Hung <hunga@google.com> Select common codecs for MediaCodecTest.testException

Changed audio codec (decoder) from AMR-WB to MP3
as should be available on more Android devices.
Allow testing to proceed even if some codecs are not available.

Bug: 18349242
Change-Id: Ia2fe17f555f69e94a652069e20aa9848fdd0ec7e
(cherry picked from commit 8143153cef876e2b14eb6d170cab85d6973349f1)
rc/android/media/cts/MediaCodecTest.java
461b5b4d53447e2e2d78819cd7164e7c97ff4655 30-Apr-2015 Chong Zhang <chz@google.com> cts: add test for persistent input surface

Change-Id: I0235f9dc32076ca4e851fa619390bb2c601f2385
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/InputSurface.java
28467140044b25e22b32bbe7690437ebc9f7644c 30-Apr-2015 Robert Shih <robertshih@google.com> MediaPlayerTest: explicitly place external tracks after internal ones

Bug: 20730248
Change-Id: I451495b7ea095ae16a4ac0800568cc7afc69dba5
rc/android/media/cts/MediaPlayerTest.java
b2623a6d0201f9a82021001b31284adc93947cdb 30-Apr-2015 Wei Jia <wjia@google.com> Reset some members when they are released.

Bug: 19665338
Change-Id: I83dbc79bf2d71c48d19c8c6ea3831c4c4277b10c
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
bae5133540f31b71698a2ea1ba1dcf2bfe5809c3 30-Apr-2015 Andy Hung <hunga@google.com> Merge "Verify PlaybackSettings in AudioTrackTest#testVariableSpeedPlayback" into mnc-dev
9e82321faf37b8bbb9525f181dd9f046138b0edb 30-Apr-2015 Wei Jia <wjia@google.com> Merge "MediaSync: Add CTS tests." into mnc-dev
e2777480fa576fc313815fb4e42ab3923a3bf49f 28-Apr-2015 Wei Jia <wjia@google.com> MediaSync: Add CTS tests.

This patch obsoletes https://googleplex-android-review.git.corp.google.com/#/c/667698/.

Bug: 19666434
Change-Id: Ied23339cc2d3772ebba150d7038ebe81da3ac9e4
rc/android/media/cts/MediaSyncTest.java
c41a7dbcf528c8fe924989ed37ec58124cd18a2b 26-Apr-2015 Andy Hung <hunga@google.com> Increase AudioTrackTest to 192kHz

Change-Id: I2501306d17ad1104e99a278c1ca44df9e9c4e0e7
rc/android/media/cts/AudioTrackTest.java
9842d46295f188554f883665d6785283ff3fd544 25-Apr-2015 Andy Hung <hunga@google.com> Increase AudioRecordTest to 192kHz

Change-Id: I39dc7f55dd50b7c5579d87f1362a7bbca9f0bc9d
rc/android/media/cts/AudioRecordTest.java
cbade83fee83f8205885f1a62838adaf57b1c4d2 19-Apr-2015 Andy Hung <hunga@google.com> Add channel index AudioRecord tests

Change-Id: I40bbc01374d6d1c9cd1ed05ac2a9583d1cbb9d27
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioRecordTest.java
adec96129a0d7085f2b9006f87e84b20a20d07ce 28-Apr-2015 Andy Hung <hunga@google.com> Verify PlaybackSettings in AudioTrackTest#testVariableSpeedPlayback

Change-Id: If16ed3ae55edc2067b515e876e160abe8cb82e4c
rc/android/media/cts/AudioTrackTest.java
dab3acf16244e13e5a8c0db99ec966c2ca13bafc 23-Apr-2015 Ronghua Wu <ronghuawu@google.com> media: enable video for playback rate test.

Bug: 19196501
Change-Id: I1c7f3cfbd411cad887223c84ce000ed9371a47b6
rc/android/media/cts/MediaPlayerTest.java
446e88bffd608704613368dfe8b56dec6f45729e 21-Apr-2015 Andy Hung <hunga@google.com> am 8b5d911b: am d075de8f: am 080e3f16: Skip AudioTrackTest#testPlayStaticData if no audio output found

* commit '8b5d911ba7cd4c1b0a5a9b3624a806e54d3bcfe4':
Skip AudioTrackTest#testPlayStaticData if no audio output found
8b5d911ba7cd4c1b0a5a9b3624a806e54d3bcfe4 21-Apr-2015 Andy Hung <hunga@google.com> am d075de8f: am 080e3f16: Skip AudioTrackTest#testPlayStaticData if no audio output found

* commit 'd075de8f9142a78b85b2d4f9183dac81c9580641':
Skip AudioTrackTest#testPlayStaticData if no audio output found
d075de8f9142a78b85b2d4f9183dac81c9580641 21-Apr-2015 Andy Hung <hunga@google.com> am 080e3f16: Skip AudioTrackTest#testPlayStaticData if no audio output found

* commit '080e3f1631dec23d348329a137c21df9a6f28b4b':
Skip AudioTrackTest#testPlayStaticData if no audio output found
080e3f1631dec23d348329a137c21df9a6f28b4b 21-Apr-2015 Andy Hung <hunga@google.com> Skip AudioTrackTest#testPlayStaticData if no audio output found

Bug: 20340550
Change-Id: Id42c3575a0195196f65e7439269ef29655e9b5d7
rc/android/media/cts/AudioTrackTest.java
9a81d63f91ee028aa989f99c56aa0336e8080e0d 18-Apr-2015 Andy Hung <hunga@google.com> Add variable PlaybackSettings test to AudioTrackTest

Change-Id: If5b3997e7868402b0a40b64a677f432ce83d8189
rc/android/media/cts/AudioTrackTest.java
43105288c480696bd8286c5c1a1e159f5aa5c787 15-Apr-2015 Andy Hung <hunga@google.com> Add non blocking reads to AudioRecordTest

Change-Id: If949ade33efdd0014f28bf86e88c2877272bcdea
rc/android/media/cts/AudioRecordTest.java
dbd500a70bbd28e2a233d4f46006da74a07bfbce 13-Apr-2015 Andy Hung <hunga@google.com> Update AudioRecordTest for 96kHz

Change-Id: Ia890eea1d19eac54132e63bd66af1db0a88eff0d
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioRecordTest.java
240ebe71d425c02fea5b37887fb18f59ad25030f 16-Apr-2015 Chris Watkins <watk@google.com> Merge "Tests for media classes accepting MediaDataSources."
3b5af16f8a21e9ce5de57b7c748d8eda1b0bdbec 20-Mar-2015 Chris Watkins <watk@google.com> Tests for media classes accepting MediaDataSources.

Bug: 19429378
Change-Id: Ie734b51819785047c6596fd4d20eaf43c5d60a4b
rc/android/media/cts/MediaExtractorTest.java
rc/android/media/cts/MediaMetadataRetrieverTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
rc/android/media/cts/TestMediaDataSource.java
d85d98e3c62d1beb1762a1b1c7f3c95195cf163a 29-Jan-2015 Andy Hung <hunga@google.com> Add channel index AudioTrack cts test

Change-Id: I3921f797400b748d5556949afa66feeab5088176
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioTrackTest.java
69b77b37c0c05448114c0ae479bb6b2efd36f0f1 14-Apr-2015 Andy Hung <hunga@google.com> Merge "Add 8 bit and float format checking to AudioRecordTest"
0830ac38a433e25dc5d32ee6aad28ec40f5a651e 27-Mar-2015 Andy Hung <hunga@google.com> Add 8 bit and float format checking to AudioRecordTest

Change-Id: If2ba3c47ea3149edcd5d3a8cb55ff13fb56b42ac
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioRecordTest.java
fc122a48b97e3a6d74458f52205e56ee85270ee3 19-Feb-2015 Wei Jia <wjia@google.com> MediaPlayer: add CTS test for setPlaybackRate.

Bug: 19196501
Change-Id: I8a184732a17e992581ed6c8213f8b00272ec5b49
rc/android/media/cts/MediaPlayerTest.java
1aa49a23e21c9c8a4da0a7cd45eeb0298dec0fe2 03-Apr-2015 Jeff Tinker <jtinker@google.com> Add tests for unprefixed EME APIs

bug: 19771612
bug: 19771431
Change-Id: Ib3dbb1bf19ef77e22498d411dbfd1719b08a81f5
rc/android/media/cts/MediaDrmMockTest.java
fcf7fc5a7ae12c7c86f2d0377e79bb512a7e61ba 07-Apr-2015 Jean-Michel Trivi <jmtrivi@google.com> Merge "Update android.media.AsyncPlayer test"
ca1b0dd3b38126c66446289e6f64fe28395110ee 07-Apr-2015 Jason Parks <jparks@google.com> am 566b949b: Don’t run on devices with no audio output.

* commit '566b949b18fa3690783de0998f52b90f6d61c0eb':
Don’t run on devices with no audio output.
1f01ff0413151c89d4225ac9ab7279caf1a5c58f 04-Apr-2015 Elliott Hughes <enh@google.com> am 44812954: am 7f2311ed: am c12988d5: Merge "Test using getOutputImage for reading buffer contents"

* commit '448129546d11baca78a1220537e69450c74d7426':
Test using getOutputImage for reading buffer contents
7f2311ed1fae0cce25bfd9174fb13b6368a9135d 04-Apr-2015 Elliott Hughes <enh@google.com> am c12988d5: Merge "Test using getOutputImage for reading buffer contents"

* commit 'c12988d51b374299d6269e41edbbe636a2307f91':
Test using getOutputImage for reading buffer contents
c12988d51b374299d6269e41edbbe636a2307f91 04-Apr-2015 Elliott Hughes <enh@google.com> Merge "Test using getOutputImage for reading buffer contents"
a1894a2929d37e26a29d4a8516e3f78b151be48e 22-Jan-2015 Jean-Michel Trivi <jmtrivi@google.com> Update android.media.AsyncPlayer test

Exercise play() method that uses android.media.AudioAttributes.

Change-Id: Iffdd17374fbe9d1cb7327f1cd39ac03209d73fe8
rc/android/media/cts/AsyncPlayerTest.java
566b949b18fa3690783de0998f52b90f6d61c0eb 02-Apr-2015 Jason Parks <jparks@google.com> Don’t run on devices with no audio output.

Bug: 19900185
Change-Id: I70128e5ff2b40dadc677ba744e3450a6499b5328
(cherry picked from commit 5dbab866a09481e27976b144a23f189e68b1fb16)
rc/android/media/cts/VisualizerTest.java
1e3a0c65ef5c459259ca772277057945bd9e7cee 02-Apr-2015 Jason Parks <jparks@google.com> am a4946092: am 2343b059: am 5dbab866: Don’t run on devices with no audio output.

* commit 'a4946092beb3083234091138dc04a9fa5782afd7':
Don’t run on devices with no audio output.
2343b0593320be490f023b8ade27cdf3f6662c53 02-Apr-2015 Jason Parks <jparks@google.com> am 5dbab866: Don’t run on devices with no audio output.

* commit '5dbab866a09481e27976b144a23f189e68b1fb16':
Don’t run on devices with no audio output.
5dbab866a09481e27976b144a23f189e68b1fb16 02-Apr-2015 Jason Parks <jparks@google.com> Don’t run on devices with no audio output.

Bug: 19900185
Change-Id: I70128e5ff2b40dadc677ba744e3450a6499b5328
rc/android/media/cts/VisualizerTest.java
8ea2becef97509aef884c82cff8d794714ea9a25 30-Mar-2015 Qiwen Zhao <zhao@google.com> DO NOT MERGE ANYWHERE.

Revert "DO NOT MERGE ANYWHERE."

This reverts commit b7c798f9b84c7c100aa37e6aa77e7f31460c7bd7, reversing
changes made to 4e8ecc32db5d3a17ccec099681425c34b630d23b.
ibmediandkjni/native-media-jni.cpp
es/raw/monotestgsm.wav
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
0bf5cf4ab5038b8a5cb81901f6ced62e5757fcb3 27-Mar-2015 Andy Hung <hunga@google.com> Merge "Check marker and periodic event timing in AudioRecordTest"
78a9a55b1c02533a6f8ebc080564b6b1b44d8317 26-Mar-2015 John Spurlock <jspurlock@google.com> CTS: Update audio manager test to understand min volume.

Bug: 19934906
Change-Id: I1c086b135bccb5e04921f91196fad2d1e893bd9d
rc/android/media/cts/AudioManagerTest.java
8c86d0a83653ef765f5ec6261bdb71c91a49e9c9 19-Mar-2015 Andy Hung <hunga@google.com> Check marker and periodic event timing in AudioRecordTest

Change-Id: If7db8320897dcc76397cb9759f719d5104b565f1
rc/android/media/cts/AudioHelper.java
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
18a34b8a9fe9e482323b42fee72eafc0caece30e 16-Mar-2015 Ronghua Wu <ronghuawu@google.com> am d649c2f4: am c1cfa29f: am 542c2844: media: update vp9 360p test clip with tile columns and frame parallel mode turned on.

* commit 'd649c2f49502de3a8546576b0ee6dc87e7dbea56':
media: update vp9 360p test clip with tile columns and frame parallel mode turned on.
c1cfa29fddb4d9c8caa74d47897edc54799e4b06 16-Mar-2015 Ronghua Wu <ronghuawu@google.com> am 542c2844: media: update vp9 360p test clip with tile columns and frame parallel mode turned on.

* commit '542c2844885ad6157e8ee40d15f448f984704ce2':
media: update vp9 360p test clip with tile columns and frame parallel mode turned on.
0ab5396a140828e8fdefa8c4f7327fe15562ded0 13-Mar-2015 Unsuk Jung <unsuk@google.com> am 39fad2a4: am 57ca28e0: am 1ef4aa92: am 7fc44c34: Merge "update EncoderVirtualDisplayTest to use very long i-frame interval." into lmp-sprout-dev

* commit '39fad2a4e1ab88e2cfad1b1ac841d6b522aa0971':
update EncoderVirtualDisplayTest to use very long i-frame interval.
39fad2a4e1ab88e2cfad1b1ac841d6b522aa0971 13-Mar-2015 Unsuk Jung <unsuk@google.com> am 57ca28e0: am 1ef4aa92: am 7fc44c34: Merge "update EncoderVirtualDisplayTest to use very long i-frame interval." into lmp-sprout-dev

* commit '57ca28e0d9a278040eca67f80d367eb5c888a528':
update EncoderVirtualDisplayTest to use very long i-frame interval.
1ef4aa926f32e8102b2280d8c3fc77465bd72fb9 13-Mar-2015 Unsuk Jung <unsuk@google.com> am 7fc44c34: Merge "update EncoderVirtualDisplayTest to use very long i-frame interval." into lmp-sprout-dev

* commit '7fc44c344dc0b461d76f6a49047c1cd93f671c21':
update EncoderVirtualDisplayTest to use very long i-frame interval.
542c2844885ad6157e8ee40d15f448f984704ce2 12-Mar-2015 Ronghua Wu <ronghuawu@google.com> media: update vp9 360p test clip with tile columns and frame parallel mode turned on.

Bug: 19398878
Change-Id: Ieda7f8af590b297e0d083c312e2ea3c79012d87a
(cherry picked from commit eaa0324336c2fb6fd3fd0370a2ecef435b623f19)
es/raw/video_640x360_webm_vp9_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_640x360_webm_vp9_1638kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/DecoderTest.java
eaa0324336c2fb6fd3fd0370a2ecef435b623f19 12-Mar-2015 Ronghua Wu <ronghuawu@google.com> media: update vp9 360p test clip with tile columns and frame parallel mode turned on.

Bug: 19398878
Change-Id: Ieda7f8af590b297e0d083c312e2ea3c79012d87a
es/raw/video_640x360_webm_vp9_1600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_640x360_webm_vp9_1638kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/DecoderTest.java
a3857a8ad5d0b269633a6cb9be739e07f9e4bfde 03-Mar-2015 keunyoung <keunyoung@google.com> update EncoderVirtualDisplayTest to use very long i-frame interval.

- Long iframe interval is used intentionally for minimizing latency
and it fails in some partner devices.
- This CL passes big value to fail it if not properly handled.

bug: 19520372

Change-Id: I5a8ca5bf8fe0253e85ebc023a515d68ddb403071
rc/android/media/cts/EncodeVirtualDisplayTest.java
8f2964fa3123f601bb63fd3bd3dba135241eda74 04-Mar-2015 John Spurlock <jspurlock@google.com> CTS: Remove tests for master volume + ramp.

Bug: 19582978
Change-Id: I12d25097d600c4392117304f944b4107c2f18f11
rc/android/media/cts/AudioManagerTest.java
39f3207e0e6a771e02e0aabd624dd62f151b6cd1 24-Feb-2015 Ricardo Garcia <rago@google.com> Modified Audio_Output feature usage in CTS tests

Before, many CTS tests were not performed if the audio_output feature
was not enabled. Now, the system will use the default audio stub if
there is no other audio HAL defined, and this stub is mostly
functional, and suitable for CTS tests.

This is needed for audio_output feature support.

bug: 19439530
Change-Id: I8be009969401496edce60ebb021c837da4c370ca
rc/android/media/cts/AudioEffectTest.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/EqualizerTest.java
rc/android/media/cts/LoudnessEnhancerTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
rc/android/media/cts/PostProcTestBase.java
rc/android/media/cts/VisualizerTest.java
b0cc94bc0d70d44b337731e4028653a522d36ed1 19-Feb-2015 Bill Yi <byi@google.com> Merge commit 'a0e9ee422d22fa4a59c1d31d29533f0581e1d905' into HEAD
ef798e277abbe30abb64013aa3b8ba5666856d07 19-Feb-2015 Marco Nelissen <marcone@google.com> am 1658d76d: am 31d76b12: Merge "CTS test for GSM decoding"

* commit '1658d76d254819d2a578e7a53cc58749fde5c1ec':
CTS test for GSM decoding
1658d76d254819d2a578e7a53cc58749fde5c1ec 19-Feb-2015 Marco Nelissen <marcone@google.com> am 31d76b12: Merge "CTS test for GSM decoding"

* commit '31d76b1260701debdce8d1ba3fc7a1f9d718d2e0':
CTS test for GSM decoding
2b6c049f32e687a55cce8544ff4f4adbf6c9d63f 19-Feb-2015 Marco Nelissen <marcone@google.com> CTS test for GSM decoding

Change-Id: I3d33cd0e4efd36379c5c5ef7f63e62616f2a1d09
es/raw/monotestgsm.wav
rc/android/media/cts/DecoderTest.java
38e6abb39194316efaef9a5daf44bd0f49bbce27 17-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 62c9510e: am 99b52fbe: am 669878b9: am 6ba3009d: am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to

* commit '62c9510eab83c70419eda5281c447e6f15bd77d0':
Update Android CTS bandaid urls that use test_key1 to a new key
62c9510eab83c70419eda5281c447e6f15bd77d0 17-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 99b52fbe: am 669878b9: am 6ba3009d: am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" i

* commit '99b52fbea97cd8a8c95339dc1ff1681b934b1610':
Update Android CTS bandaid urls that use test_key1 to a new key
99b52fbea97cd8a8c95339dc1ff1681b934b1610 17-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 669878b9: am 6ba3009d: am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '669878b9458561598fc41939f2dafbf3793d216c':
Update Android CTS bandaid urls that use test_key1 to a new key
669878b9458561598fc41939f2dafbf3793d216c 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 6ba3009d: am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '6ba3009dd91409a33e09c723f74aa488acf1b124':
Update Android CTS bandaid urls that use test_key1 to a new key
6ba3009dd91409a33e09c723f74aa488acf1b124 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 0744f81e: am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '0744f81e19ad40bdd73648adc5197c4a2d770321':
Update Android CTS bandaid urls that use test_key1 to a new key
0744f81e19ad40bdd73648adc5197c4a2d770321 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '5bff7130efa9ab7ff239f5cafd406c43c6b5ec41':
Update Android CTS bandaid urls that use test_key1 to a new key
605ed8bd783cc0d313665e99d91718bd5992503e 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 740270dc: am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '740270dc5c412696ed899e1aae747cf6c0493806':
Update Android CTS bandaid urls that use test_key1 to a new key
740270dc5c412696ed899e1aae747cf6c0493806 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 1ca6c54c: am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '1ca6c54c80dffc3ee0e7e154ca3614d65caaa785':
Update Android CTS bandaid urls that use test_key1 to a new key
1ca6c54c80dffc3ee0e7e154ca3614d65caaa785 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 135b3967: am cbbfd900: am f82b9449: am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '135b3967538b44ecd9b8a41c1454dcace33dea40':
Update Android CTS bandaid urls that use test_key1 to a new key
f82b94492eb19f260b515eba725a2c401b93bf42 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 29de7b18: am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '29de7b189ab7c99485382f01a2c74f50328bd959':
Update Android CTS bandaid urls that use test_key1 to a new key
29de7b189ab7c99485382f01a2c74f50328bd959 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '7988d7f825dcff633721c77313bdcf8ae316e312':
Update Android CTS bandaid urls that use test_key1 to a new key
b4832576d54ae99ca5d3cc5d34db6dc53229dedd 13-Feb-2015 Nicholas Sauer <nicksauer@google.com> Update Android CTS bandaid urls that use test_key1 to a new key

bug:18640852
Change-Id: I2fe936a4f3007f95c41c932b7bf251ddff19999e
rc/android/media/cts/MediaCodecCapabilitiesTest.java
fb622e275adbf62112c9db80a2225cfbe8bcdfc5 12-Feb-2015 Narayan Kamath <narayan@google.com> Merge "Add explicit dependencies on org.apache.http.legacy"
083b23b6130ca674d069b9ef0e72dc4232a5818e 11-Feb-2015 Nicholas Sauer <nicksauer@google.com> am e2699539: am 6077e189: am 91a8163f: am e2617e7c: am 6dd2d0f5: am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to

* commit 'e269953946c1eef616690d2103c518956d41bbfc':
Update Android CTS bandaid urls that use test_key1 to a new key
bb08dee701b98c0248f8a90da1075d29ea722813 11-Feb-2015 Nicholas Sauer <nicksauer@google.com> am d6d49a94: am 3c41315c: am 7c22f6d9: am d121e03c: am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

* commit 'd6d49a9449619fce0d9a51a9427af97ea39b03c8':
Update Android CTS bandaid urls that use test_key1 to a new key
e269953946c1eef616690d2103c518956d41bbfc 11-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 6077e189: am 91a8163f: am e2617e7c: am 6dd2d0f5: am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" i

* commit '6077e189e2d16a8f3cba88d0fd0c415ec5d1cd9f':
Update Android CTS bandaid urls that use test_key1 to a new key
d6d49a9449619fce0d9a51a9427af97ea39b03c8 11-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 3c41315c: am 7c22f6d9: am d121e03c: am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

* commit '3c41315c58a176ba7dd1368e487b5f493d49da54':
Update Android CTS bandaid urls that use test_key1 to a new key
6077e189e2d16a8f3cba88d0fd0c415ec5d1cd9f 11-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 91a8163f: am e2617e7c: am 6dd2d0f5: am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '91a8163f375131424e01a8f908f40cb86b27a862':
Update Android CTS bandaid urls that use test_key1 to a new key
91a8163f375131424e01a8f908f40cb86b27a862 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am e2617e7c: am 6dd2d0f5: am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'e2617e7c1de3c9f4224baf3952a98a612e05bae2':
Update Android CTS bandaid urls that use test_key1 to a new key
e2617e7c1de3c9f4224baf3952a98a612e05bae2 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 6dd2d0f5: am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '6dd2d0f5dcefff00b27747a88ec66cdc9b16de0c':
Update Android CTS bandaid urls that use test_key1 to a new key
6dd2d0f5dcefff00b27747a88ec66cdc9b16de0c 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 2772992b: am 6614394a: am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '2772992b7da57838cfbe1c6d48281d84798e3040':
Update Android CTS bandaid urls that use test_key1 to a new key
6614394abaed5b07c6f3090c2dadb341b9be1be9 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 5028a1a1: am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '5028a1a1b5534a5abc4f15cb5ae0c1a5f0554a90':
Update Android CTS bandaid urls that use test_key1 to a new key
5028a1a1b5534a5abc4f15cb5ae0c1a5f0554a90 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 1eba16a5: am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '1eba16a5771fb8e5819af8addcb9f1714d1b3351':
Update Android CTS bandaid urls that use test_key1 to a new key
1eba16a5771fb8e5819af8addcb9f1714d1b3351 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 86eecf46: am a15ba0e7: am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '86eecf4686b510fcbe6316f77414d30fb9c50390':
Update Android CTS bandaid urls that use test_key1 to a new key
b55ee96b0345250e56090b0b566f9eead69c1bbd 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'f9a6b37b56ec119a62af9c3833901c3193b86348':
Update Android CTS bandaid urls that use test_key1 to a new key
f9a6b37b56ec119a62af9c3833901c3193b86348 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'cf05e0c263bb9977480957049e7813b58276364a':
Update Android CTS bandaid urls that use test_key1 to a new key
ac08bc8a4827f300f6c9937ca4ec7497867b7895 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev
3c41315c58a176ba7dd1368e487b5f493d49da54 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 7c22f6d9: am d121e03c: am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

* commit '7c22f6d9a2e9e1145a214c4eb5a0b94eecea2d84':
Update Android CTS bandaid urls that use test_key1 to a new key
7c22f6d9a2e9e1145a214c4eb5a0b94eecea2d84 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am d121e03c: am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

* commit 'd121e03ca26a0f057ee2eaa2bfd6764cecef0924':
Update Android CTS bandaid urls that use test_key1 to a new key
d121e03ca26a0f057ee2eaa2bfd6764cecef0924 10-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 2dbf0177: am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

* commit '2dbf0177ec1cf0895c3f4b0e166048f13b2ce853':
Update Android CTS bandaid urls that use test_key1 to a new key
6d986852192c987d9c2f4cb5a6770c65e077b33b 09-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 9cd799e8: am fca7c4fe: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into lmp-mr1-dev

* commit '9cd799e8fee57b94ee4124c0cc15d564c16e718e':
Update Android CTS bandaid urls that use test_key1 to a new key
9cd799e8fee57b94ee4124c0cc15d564c16e718e 09-Feb-2015 Nicholas Sauer <nicksauer@google.com> am fca7c4fe: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into lmp-mr1-dev

* commit 'fca7c4fe6aa9ab6a5e4795be4ae543ad07bc4e1d':
Update Android CTS bandaid urls that use test_key1 to a new key
fca7c4fe6aa9ab6a5e4795be4ae543ad07bc4e1d 09-Feb-2015 Nicholas Sauer <nicksauer@google.com> Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into lmp-mr1-dev
2dbf0177ec1cf0895c3f4b0e166048f13b2ce853 09-Feb-2015 Nicholas Sauer <nicksauer@google.com> am 1ab76479: am 7f541d6d: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev

* commit '1ab764799312d8577b2231fcb6f99c4829eb3ac9':
Update Android CTS bandaid urls that use test_key1 to a new key
7f541d6d9af80f3479285c40f935cfc4bf4a6394 09-Feb-2015 Nicholas Sauer <nicksauer@google.com> Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into klp-dev
cc0908ee81685f1152afcc1d96ab1853567cfed9 06-Feb-2015 RoboErik <epastern@google.com> Merge "Add CTS tests for the mute APIs"
bbe0a72abbbfdd5e32791d1d51ca97a6adc36ab9 06-Feb-2015 Lajos Molnar <lajos@google.com> am 6892d5d4: am d5ecb89b: Merge "media: added data check to ImageReaderDecoderTest" into lmp-mr1-dev

* commit '6892d5d49a873ad92eb24aa55a25c41d11965db9':
media: added data check to ImageReaderDecoderTest
db20fa071fc2dd808796129b31d34a368ae4cba8 06-Feb-2015 Lajos Molnar <lajos@google.com> am b729deba: am 6fac079f: Merge "media: add flexYUV statistics methods to CodecUtils" into lmp-mr1-dev

* commit 'b729debaca842f54aadc8f69c682d8ee4b60eb6e':
media: add flexYUV statistics methods to CodecUtils
b07374d75872c460a62a41e8d2b5aab12bfdd9d1 12-Dec-2014 Narayan Kamath <narayan@google.com> Add explicit dependencies on org.apache.http.legacy

Test modules that depend on the CTS testserver must declare
explicit dependencies on org.apache.http.legacy.

Also fix some bizarre build rules; ctstestserver builds directly
against the framework but compiled into apps that target SDK 16.

bug: 18027885

Change-Id: I905942d8ed71812499df94e3e5970c0b08716528
ndroid.mk
ndroidManifest.xml
6892d5d49a873ad92eb24aa55a25c41d11965db9 06-Feb-2015 Lajos Molnar <lajos@google.com> am d5ecb89b: Merge "media: added data check to ImageReaderDecoderTest" into lmp-mr1-dev

* commit 'd5ecb89b71417cee41797cb6cc6b2189a8532bb5':
media: added data check to ImageReaderDecoderTest
b729debaca842f54aadc8f69c682d8ee4b60eb6e 06-Feb-2015 Lajos Molnar <lajos@google.com> am 6fac079f: Merge "media: add flexYUV statistics methods to CodecUtils" into lmp-mr1-dev

* commit '6fac079f48c70dfdc4cc5328700f87a83bf81280':
media: add flexYUV statistics methods to CodecUtils
a57b8aefe918627bbf7bd707c0805f4e715c61c7 05-Feb-2015 RoboErik <epastern@google.com> Add CTS tests for the mute APIs

Tests both setStreamMute and adjustStream with mute flags.

Change-Id: I86f6b667bc0760c853d5ae6ed6af5dc8fadfddb8
rc/android/media/cts/AudioManagerTest.java
46389ea04b2d9a65f51db4ee45a4a4d24aa4c3bb 04-Feb-2015 Lajos Molnar <lajos@google.com> media: added data check to ImageReaderDecoderTest

check YUV data on known swirl pattern for both ImageReader and
MediaCodec.getOutputImage interfaces.

Bug: 19179288
Change-Id: I86a00d19fb4ee09605616787979b1d79ae54a212
es/raw/swirl_128x128_h264.mp4
es/raw/swirl_128x128_h265.mp4
es/raw/swirl_128x128_mpeg4.mp4
es/raw/swirl_128x128_vp8.webm
es/raw/swirl_128x128_vp9.webm
es/raw/swirl_128x96_h263.3gp
es/raw/swirl_130x132_h264.mp4
es/raw/swirl_130x132_h265.mp4
es/raw/swirl_130x132_mpeg4.mp4
es/raw/swirl_130x132_vp8.webm
es/raw/swirl_130x132_vp9.webm
es/raw/swirl_132x130_h264.mp4
es/raw/swirl_132x130_h265.mp4
es/raw/swirl_132x130_mpeg4.mp4
es/raw/swirl_132x130_vp8.webm
es/raw/swirl_132x130_vp9.webm
es/raw/swirl_136x144_h264.mp4
es/raw/swirl_136x144_h265.mp4
es/raw/swirl_136x144_mpeg4.mp4
es/raw/swirl_136x144_vp8.webm
es/raw/swirl_136x144_vp9.webm
es/raw/swirl_144x136_h264.mp4
es/raw/swirl_144x136_h265.mp4
es/raw/swirl_144x136_mpeg4.mp4
es/raw/swirl_144x136_vp8.webm
es/raw/swirl_144x136_vp9.webm
es/raw/swirl_176x144_h263.3gp
es/raw/swirl_352x288_h263.3gp
rc/android/media/cts/ImageReaderDecoderTest.java
878a28e6fc23432eb00a44bbee4b57ffdb984298 03-Feb-2015 Lajos Molnar <lajos@google.com> media: add flexYUV statistics methods to CodecUtils

Bug: 19179288
Change-Id: Ib4826b483e86e65b3869c095d330470eb52ad857
ibmediandkjni/codec-utils-jni.cpp
rc/android/media/cts/CodecUtils.java
fd69eeb6af4d4f26f5483171200a7c4c06621b5b 04-Feb-2015 Ronghua Wu <ronghuawu@google.com> am 3bccb60b: am 703cdab8: Merge "media: allow test to continue waiting for complete if there\'s new encoder output" into lmp-mr1-dev

* commit '3bccb60be8f7fb639ba69f667b5d8559bed96680':
media: allow test to continue waiting for complete if there's new encoder output
3bccb60be8f7fb639ba69f667b5d8559bed96680 04-Feb-2015 Ronghua Wu <ronghuawu@google.com> am 703cdab8: Merge "media: allow test to continue waiting for complete if there\'s new encoder output" into lmp-mr1-dev

* commit '703cdab821e12fa798f5f90dfe8eacf793b5866a':
media: allow test to continue waiting for complete if there's new encoder output
703cdab821e12fa798f5f90dfe8eacf793b5866a 04-Feb-2015 Ronghua Wu <ronghuawu@google.com> Merge "media: allow test to continue waiting for complete if there's new encoder output" into lmp-mr1-dev
3b52bda94af2c723288430e260d4898d30d51f3e 03-Feb-2015 Ronghua Wu <ronghuawu@google.com> media: allow test to continue waiting for complete if there's new encoder output

Bug: 19194926
Change-Id: I2a2cd40dd34cfd8be106ef742d82c3ba4868e3af
rc/android/media/cts/VideoEncoderTest.java
9284e958bb9b250646cc2cc2d2a9dbc8c2032d2a 02-Feb-2015 Ricardo Garcia <rago@google.com> am 406b4cde: am 7e2974ac: Merge "Fix timing issue when testing Media Player really started playing." into lmp-mr1-dev

* commit '406b4cdeccc78e9d2423e6384f9dfb9ab1bc48e8':
Fix timing issue when testing Media Player really started playing.
406b4cdeccc78e9d2423e6384f9dfb9ab1bc48e8 02-Feb-2015 Ricardo Garcia <rago@google.com> am 7e2974ac: Merge "Fix timing issue when testing Media Player really started playing." into lmp-mr1-dev

* commit '7e2974ac4d80526a4dc38e0ce5a6d3484536284a':
Fix timing issue when testing Media Player really started playing.
7cd754308b1761718f10765de99821e2d0bac9ef 31-Jan-2015 Ricardo Garcia <rago@google.com> Fix timing issue when testing Media Player really started playing.

The testing time boundary was too close to the looping point in the
short file. In some devices it was close enough to continue looping and
fail the test.

bug: 19211611
Change-Id: Icc6bd6c6c0183f84ae30a89c8bc05c3c0e8a8577
rc/android/media/cts/VisualizerTest.java
74784d88a760aa6d6da8cb80076de9ac5a1648e1 30-Jan-2015 Lajos Molnar <lajos@google.com> am fbeed2c5: am 874c86ae: Merge "media: separate arbitrary VideoEncoderTests" into lmp-mr1-dev

* commit 'fbeed2c5a1ec838d6f6e4a57d68bc07bca16738a':
media: separate arbitrary VideoEncoderTests
fbeed2c5a1ec838d6f6e4a57d68bc07bca16738a 30-Jan-2015 Lajos Molnar <lajos@google.com> am 874c86ae: Merge "media: separate arbitrary VideoEncoderTests" into lmp-mr1-dev

* commit '874c86ae587d2660cc36515cdf00147a4f28e8c7':
media: separate arbitrary VideoEncoderTests
8e56bf2f1d4cae9182022d6ba0307fe4aec6ab2d 29-Jan-2015 Lajos Molnar <lajos@google.com> media: separate arbitrary VideoEncoderTests

Also remove masking exceptions when creating the Encoders() array

Bug: 19013118
Change-Id: Idea4c166e6cdc0b55f8ac0047648034a2b5278ba
rc/android/media/cts/VideoEncoderTest.java
6169bddc1ce0a9397a3475b54166f9e2b0b96a2c 29-Jan-2015 Lajos Molnar <lajos@google.com> am 29b07ef3: am e556bba0: Merge "media: handle unsupported sizes in arbitrary VideoEncoderTests" into lmp-mr1-dev

* commit '29b07ef370b09a3d09cb7034d2073130561943a8':
media: handle unsupported sizes in arbitrary VideoEncoderTests
29b07ef370b09a3d09cb7034d2073130561943a8 29-Jan-2015 Lajos Molnar <lajos@google.com> am e556bba0: Merge "media: handle unsupported sizes in arbitrary VideoEncoderTests" into lmp-mr1-dev

* commit 'e556bba0bbc10b5ec75d1288cd8e54e5bc83e2aa':
media: handle unsupported sizes in arbitrary VideoEncoderTests
e556bba0bbc10b5ec75d1288cd8e54e5bc83e2aa 29-Jan-2015 Lajos Molnar <lajos@google.com> Merge "media: handle unsupported sizes in arbitrary VideoEncoderTests" into lmp-mr1-dev
b0bc4ca51b5670829ef50748e67b1e56f3982671 29-Jan-2015 Lajos Molnar <lajos@google.com> am 9f0d66af: am f6fd83b8: media: limit ImageReaderDecoderTest to consume only 1 image

* commit '9f0d66af93c60a82bbb26613531ad255081e4a6e':
media: limit ImageReaderDecoderTest to consume only 1 image
9f0d66af93c60a82bbb26613531ad255081e4a6e 29-Jan-2015 Lajos Molnar <lajos@google.com> am f6fd83b8: media: limit ImageReaderDecoderTest to consume only 1 image

* commit 'f6fd83b87efaefb39d8aca2715cd90a7b444396b':
media: limit ImageReaderDecoderTest to consume only 1 image
f6fd83b87efaefb39d8aca2715cd90a7b444396b 29-Jan-2015 Lajos Molnar <lajos@google.com> media: limit ImageReaderDecoderTest to consume only 1 image

Video decoders expect consumers with only 1 buffer-depth.

Bug: 19179927
Change-Id: I5a6e6ea1a329172b61f07f2c3a76c035e2221e53
rc/android/media/cts/ImageReaderDecoderTest.java
feeec263dd9d4c8022a93ed0a9c78baccd2498cf 29-Jan-2015 Lajos Molnar <lajos@google.com> media: handle unsupported sizes in arbitrary VideoEncoderTests

Bug: 19013118
Change-Id: I60a090c1b2e23582d84bcb0a82e97ce7ec509649
rc/android/media/cts/VideoEncoderTest.java
c83eb923b0d0998e49662a9a46736eafd8541348 28-Jan-2015 Ricardo Garcia <rago@google.com> am f80ea18a: am 2606311e: Merge "Fix for VisualizerTest running in silent mode" into lmp-mr1-dev

* commit 'f80ea18a32616ce9192e42f23798e91a4c944c61':
Fix for VisualizerTest running in silent mode
f80ea18a32616ce9192e42f23798e91a4c944c61 28-Jan-2015 Ricardo Garcia <rago@google.com> am 2606311e: Merge "Fix for VisualizerTest running in silent mode" into lmp-mr1-dev

* commit '2606311e9dfa3997b6368620da4671cf7058d882':
Fix for VisualizerTest running in silent mode
2606311e9dfa3997b6368620da4671cf7058d882 28-Jan-2015 Ricardo Garcia <rago@google.com> Merge "Fix for VisualizerTest running in silent mode" into lmp-mr1-dev
bb8ed97db34d871c90627c003dbf579653b66e23 27-Jan-2015 Ricardo Garcia <rago@google.com> Fix for VisualizerTest running in silent mode

Added suggested volume controller to the mix to avoid problems
when the property ro.audio.silent is 1.

bug: 18610264

Change-Id: Ife3b1085173ad9b9c4ff3e9c3d044905d556f272
rc/android/media/cts/PostProcTestBase.java
rc/android/media/cts/VisualizerTest.java
ae04e2199463daf03a0b428393e71329210c2dec 28-Jan-2015 Jesse Hall <jessehall@google.com> am f9c90bca: am f5819942: am 6b2811eb: Merge "PresentationSyncTest: disable faster-than-refresh case" into lmp-sprout-dev

* commit 'f9c90bca118669368448818bb6fb2a9d3db6e57e':
PresentationSyncTest: disable faster-than-refresh case
f9c90bca118669368448818bb6fb2a9d3db6e57e 27-Jan-2015 Jesse Hall <jessehall@google.com> am f5819942: am 6b2811eb: Merge "PresentationSyncTest: disable faster-than-refresh case" into lmp-sprout-dev

* commit 'f58199423223bbc29d944c367f6815ea5f83a507':
PresentationSyncTest: disable faster-than-refresh case
f58199423223bbc29d944c367f6815ea5f83a507 27-Jan-2015 Jesse Hall <jessehall@google.com> am 6b2811eb: Merge "PresentationSyncTest: disable faster-than-refresh case" into lmp-sprout-dev

* commit '6b2811ebe7b817e1a2637f7ef3a3c3803abf8591':
PresentationSyncTest: disable faster-than-refresh case
43770ed2c7f49d755fd866334d08216dd6e4fb83 24-Jan-2015 Jesse Hall <jessehall@google.com> PresentationSyncTest: disable faster-than-refresh case

As described in the comment, the throughput test that tries to run
faster than the refresh rate makes a couple invalid assumptions. This
change disables that case.

The primary uses of this feature involve producing frames at the
refresh rate or slower.

Bug: 18913338
Change-Id: I27bb72b84732e17341ed270e01f8ba8f02d56b71
rc/android/media/cts/PresentationSyncTest.java
492e72f2f6f94372565fd7ea53c97924188d7d1a 15-Jan-2015 Zhijun He <zhijunhe@google.com> am a086b3a3: am ec875568: am 0b355c80: CamcorderProfileTest: fix the last timelapse id value

* commit 'a086b3a3bf471fcf97f99d5b4dfd31edff1349ab':
CamcorderProfileTest: fix the last timelapse id value
a086b3a3bf471fcf97f99d5b4dfd31edff1349ab 15-Jan-2015 Zhijun He <zhijunhe@google.com> am ec875568: am 0b355c80: CamcorderProfileTest: fix the last timelapse id value

* commit 'ec875568745cea836c9ba3c83ba7bc041920aa85':
CamcorderProfileTest: fix the last timelapse id value
ec875568745cea836c9ba3c83ba7bc041920aa85 15-Jan-2015 Zhijun He <zhijunhe@google.com> am 0b355c80: CamcorderProfileTest: fix the last timelapse id value

* commit '0b355c803aa72646f64b521fd45ae872a52b54da':
CamcorderProfileTest: fix the last timelapse id value
0b355c803aa72646f64b521fd45ae872a52b54da 15-Jan-2015 Zhijun He <zhijunhe@google.com> CamcorderProfileTest: fix the last timelapse id value

It should be QUALITY_TIME_LAPSE_2160P instead of QUALITY_TIME_LAPSE_1080P

Bug: 19011625
Change-Id: I3d86cf8ad6f6fe1e8231415027df80bcd48af495
rc/android/media/cts/CamcorderProfileTest.java
ea23fa9fc5abf675ad73e7f8f1226c4f183368bb 15-Jan-2015 Marco Nelissen <marcone@google.com> am 634dc92d: am e9d13867: am eebba016: am cd9ae7a8: am aa566b6a: am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit '634dc92dc5349a80c9f9054b9f9bd8966a932dff':
Fix test
634dc92dc5349a80c9f9054b9f9bd8966a932dff 15-Jan-2015 Marco Nelissen <marcone@google.com> am e9d13867: am eebba016: am cd9ae7a8: am aa566b6a: am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'e9d13867181c39d0f00bf5ed202cf441422d5965':
Fix test
60476f9d482284615988559d69792b252b5d5368 15-Jan-2015 Andy Hung <hunga@google.com> Merge "Add variable playback sample rate AudioTrack test"
88e272356ec9e90f8e798f66c1cfa423a5110943 10-Jan-2015 Andy Hung <hunga@google.com> Add variable playback sample rate AudioTrack test

Change-Id: I5a69cf6fde335813e4721c969463754407e72458
rc/android/media/cts/AudioTrackTest.java
e9d13867181c39d0f00bf5ed202cf441422d5965 15-Jan-2015 Marco Nelissen <marcone@google.com> am eebba016: am cd9ae7a8: am aa566b6a: am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'eebba016de9cae76fa333279835187d6804d6e4f':
Fix test
79d9e981d85de85cb7539f939f1ee262f485ec5a 14-Jan-2015 Andy Hung <hunga@google.com> Merge "Update AudioTrack_ListenerTest for marker notification"
eebba016de9cae76fa333279835187d6804d6e4f 14-Jan-2015 Marco Nelissen <marcone@google.com> am cd9ae7a8: am aa566b6a: am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'cd9ae7a802f1565d38824a59f3baa22e5b790f65':
Fix test
cd9ae7a802f1565d38824a59f3baa22e5b790f65 14-Jan-2015 Marco Nelissen <marcone@google.com> am aa566b6a: am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'aa566b6ac2fe47a62ad83722d065515ce34cb031':
Fix test
aa566b6ac2fe47a62ad83722d065515ce34cb031 14-Jan-2015 Marco Nelissen <marcone@google.com> am b49c8250: am df0e5961: am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'b49c8250f8ef1de9a3bfca2fa0c0363c16a1c68a':
Fix test
df0e59615e31748c02406d18416e07807665173c 14-Jan-2015 Marco Nelissen <marcone@google.com> am 78be3f3f: am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit '78be3f3fa422e7ade310f750bb779c4109af1a0e':
Fix test
78be3f3fa422e7ade310f750bb779c4109af1a0e 14-Jan-2015 Marco Nelissen <marcone@google.com> am c5b507e3: am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'c5b507e363929514763e6626ab9f9fa791ec572a':
Fix test
c5b507e363929514763e6626ab9f9fa791ec572a 14-Jan-2015 Marco Nelissen <marcone@google.com> am 03a64463: am 430eeb70: am 46d82f0b: am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit '03a64463b79e6312124f1d772e16499de18ad564':
Fix test
aad7f382ae9b56caa9ff40cbdc096415e7c1e891 14-Jan-2015 Andy Hung <hunga@google.com> Merge "Add static AudioTrack to listener tests"
aa059250f8a490e9a02f68e237e1d1ca4d57e3b1 14-Jan-2015 Takayuki Hoshi <hoshi@google.com> DO NOT MERGE: Fix AudioManagerTest#testVolume.

This CL combines ag/584213 and ag/611137, thus avoiding
merge-conflict.

Change-Id: I1ad34ed5c2b0a1b8a9a6a126554bbdf492a9f705
rc/android/media/cts/AudioManagerTest.java
46d82f0ba33dd35fe3307a65d50e9544fdc8247e 14-Jan-2015 Marco Nelissen <marcone@google.com> am c6fca737: am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'c6fca7376b6f475a47622ed31fb5b5f6e57f01d0':
Fix test
c6fca7376b6f475a47622ed31fb5b5f6e57f01d0 14-Jan-2015 Marco Nelissen <marcone@google.com> am ee955b85: am 26d352cd: am 6558d48b: Merge "Fix test" into jb-dev

* commit 'ee955b85ca2ddb1cfb83736a99bab7d3b886646e':
Fix test
1525b82e30ad277b6d95c81b7da837327bcc2da0 13-Jan-2015 Marco Nelissen <marcone@google.com> Fix test

MediaPlayer.isPlaying is unreliable/broken for Midi files, so don't
test that aspect.
rc/android/media/cts/MediaPlayerTest.java
761152561016f4f525b23a4e3293eb2f218709f0 13-Jan-2015 Lajos Molnar <lajos@google.com> am 7dcb2173: am b955c704: Merge "media: add checks for secure AVC playback support" into lmp-mr1-dev

* commit '7dcb2173fce43cd9866da33ab7b91a0c997e9367':
media: add checks for secure AVC playback support
4c4c1b94f9aaa2290c2e2149df9153213ff0381a 13-Jan-2015 Eric Laurent <elaurent@google.com> am 0dc88be3: am b71bf590: Merge "fix AudioManager.testVolume()" into lmp-mr1-dev

* commit '0dc88be30fc295bc7c8b7d79e9012f47c2c28f76':
fix AudioManager.testVolume()
e0937bae9f9b4b6dd4899048e6529d6f2b204a32 13-Jan-2015 Nicholas Sauer <nicksauer@google.com> Update Android CTS bandaid urls that use test_key1 to a new key

bug:18640852
Change-Id: I52c64100d3cd59a0851a721bc3da11ab975e2f35
rc/android/media/cts/MediaCodecCapabilitiesTest.java
7dcb2173fce43cd9866da33ab7b91a0c997e9367 12-Jan-2015 Lajos Molnar <lajos@google.com> am b955c704: Merge "media: add checks for secure AVC playback support" into lmp-mr1-dev

* commit 'b955c7046bb9df8583754ec325094ca15eca5614':
media: add checks for secure AVC playback support
b955c7046bb9df8583754ec325094ca15eca5614 12-Jan-2015 Lajos Molnar <lajos@google.com> Merge "media: add checks for secure AVC playback support" into lmp-mr1-dev
f7f82974b67a3f23b4da6a478f43ec9104aff2e5 10-Jan-2015 Andy Hung <hunga@google.com> Update AudioTrack_ListenerTest for marker notification

Set and check repeated marker notifications
Accumulate statistics and output report log

Change-Id: I0d075ea713a24294bcd8a6817ec09f36bac8d040
rc/android/media/cts/AudioTrack_ListenerTest.java
0dc88be30fc295bc7c8b7d79e9012f47c2c28f76 12-Jan-2015 Eric Laurent <elaurent@google.com> am b71bf590: Merge "fix AudioManager.testVolume()" into lmp-mr1-dev

* commit 'b71bf5901735442af401d8250f3f533e744da4ef':
fix AudioManager.testVolume()
b71bf5901735442af401d8250f3f533e744da4ef 12-Jan-2015 Eric Laurent <elaurent@google.com> Merge "fix AudioManager.testVolume()" into lmp-mr1-dev
9c7a355b37f91a04a4e7eacde9fe800d26fd8f8f 30-Dec-2014 Nicholas Sauer <nicksauer@google.com> Update Android CTS bandaid urls that use test_key1 to a new key

bug:18640852
Change-Id: I9d7c83395dd95af3e82619b48e6c13733786ce2d
rc/android/media/cts/DecoderTest.java
41ece30c02da2d7a03a79eda31240a57d9522af2 30-Dec-2014 Nicholas Sauer <nicksauer@google.com> Update Android CTS bandaid urls that use test_key1 to a new key

bug:18640852
Change-Id: I9d7c83395dd95af3e82619b48e6c13733786ce2d
rc/android/media/cts/StreamingMediaPlayerTest.java
b88140b6ec4e409386c7ffc19f972eee93cfa073 10-Jan-2015 Eric Laurent <elaurent@google.com> fix AudioManager.testVolume()

Do not use master volume map to calculate volume delta
if platform does not use master volume.

Bug: 18702149.
Change-Id: Iad83b6942c3516dfe22c33da9228b7b1720b2827
rc/android/media/cts/AudioManagerTest.java
d4b8c615d83dd5485bb268df440b49fb48598aad 09-Jan-2015 Lajos Molnar <lajos@google.com> am 079e3418: am 9ad1ab51: media: VideoEncoderTest: fix bug introduced when setting input buffer size

* commit '079e3418c6401feebd420a65c00433f1b07f92c6':
media: VideoEncoderTest: fix bug introduced when setting input buffer size
079e3418c6401feebd420a65c00433f1b07f92c6 09-Jan-2015 Lajos Molnar <lajos@google.com> am 9ad1ab51: media: VideoEncoderTest: fix bug introduced when setting input buffer size

* commit '9ad1ab51d0429f30829058c342d08d892ad55fa0':
media: VideoEncoderTest: fix bug introduced when setting input buffer size
9ad1ab51d0429f30829058c342d08d892ad55fa0 09-Jan-2015 Lajos Molnar <lajos@google.com> media: VideoEncoderTest: fix bug introduced when setting input buffer size

prior CL removed a critical line.

Bug: 18921559

Change-Id: Ib7c702ebcf3427a67149c7336434c8791d4d39c7
rc/android/media/cts/VideoEncoderTest.java
87568dec1c55448ddeebb2f3a7d5c1110c536bfd 08-Jan-2015 Lajos Molnar <lajos@google.com> am 24ce1582: am d7639577: Merge "media: VideoEncoderTest: set input buffer size for playback" into lmp-mr1-dev

* commit '24ce15826be9171100f751b7c8402e81ba34f7b0':
media: VideoEncoderTest: set input buffer size for playback
24ce15826be9171100f751b7c8402e81ba34f7b0 08-Jan-2015 Lajos Molnar <lajos@google.com> am d7639577: Merge "media: VideoEncoderTest: set input buffer size for playback" into lmp-mr1-dev

* commit 'd7639577326b3abc7a47496fbd96b839e7362681':
media: VideoEncoderTest: set input buffer size for playback
108269c21d2e6fdcfbc3f281260d8f0fe2354bf4 08-Jan-2015 Lajos Molnar <lajos@google.com> media: add checks for secure AVC playback support

Bug: 18670741
Change-Id: I3918d627b2d053b3aee9fff92e8783c5e9a1f0bb
rc/android/media/cts/DecoderTest.java
3212a15332565591e402814a1c42c10db45b1923 08-Jan-2015 Lajos Molnar <lajos@google.com> media: VideoEncoderTest: set input buffer size for playback

Bug: 18921559
Change-Id: I228df533ed7dc54476b6b213f3e4cb4e129deb7e
rc/android/media/cts/VideoEncoderTest.java
1ee86ea886a1617b8c716f7327cbd0b343181246 30-Dec-2014 Andy Hung <hunga@google.com> Add static AudioTrack to listener tests

Also check number of marker and periodic notifications
as well as timing of those notifications.

Change-Id: I7232f831b5a76e6e5ddb90d3b02ad3c075543aab
rc/android/media/cts/AudioTrack_ListenerTest.java
6a48dbef114ffba92b0227523dee578014c4edd0 06-Jan-2015 Marco Nelissen <marcone@google.com> am 12862522: am 7403e54f: am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev

* commit '128625222ca68a19d4cc47cca0804e598219d9a6':
Add tests for midi playback
128625222ca68a19d4cc47cca0804e598219d9a6 06-Jan-2015 Marco Nelissen <marcone@google.com> am 7403e54f: am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev

* commit '7403e54f76d3969ad4bfbfa243b77688e4cb3547':
Add tests for midi playback
f024450f79315c6e6605e6b6552e5899c55a832b 05-Jan-2015 Ronghua Wu <ronghuawu@google.com> media: release decoder explicitly instead of relying on GC.

Bug: 18835626
Change-Id: I6f5d7820ca4e936989e862b6812934942937dfa0
(cherry picked from commit b27ba911bf52f808bb315dd879bf7aaba93f61c1)
rc/android/media/cts/NativeDecoderTest.java
5734eb5493f4a36cd640b5320e28dee891e396cb 05-Jan-2015 Ronghua Wu <ronghuawu@google.com> am 28038ed2: am 811c06a3: Merge "media: release decoder explicitly instead of relying on GC." into lmp-mr1-dev

* commit '28038ed25ef16d57e98967db16b13e4c30cb2f6e':
media: release decoder explicitly instead of relying on GC.
28038ed25ef16d57e98967db16b13e4c30cb2f6e 05-Jan-2015 Ronghua Wu <ronghuawu@google.com> am 811c06a3: Merge "media: release decoder explicitly instead of relying on GC." into lmp-mr1-dev

* commit '811c06a381487c2b1ee952b167cd85e080ac88d7':
media: release decoder explicitly instead of relying on GC.
b27ba911bf52f808bb315dd879bf7aaba93f61c1 05-Jan-2015 Ronghua Wu <ronghuawu@google.com> media: release decoder explicitly instead of relying on GC.

Bug: 18835626
Change-Id: I6f5d7820ca4e936989e862b6812934942937dfa0
rc/android/media/cts/NativeDecoderTest.java
7403e54f76d3969ad4bfbfa243b77688e4cb3547 05-Jan-2015 Marco Nelissen <marcone@google.com> am 9236bf39: resolved conflicts for merge of 56213945 to lmp-dev

* commit '9236bf3927aa03c32c714b1c8c84628fc7d150ef':
Add tests for midi playback
e943e7c83e8f67330a0360ffb24c58d726fc1b67 31-Dec-2014 Andy Hung <hunga@google.com> Merge "Fix assertEquals order"
60fad0d4ff5ebeadb5c734db70c1e07674ca32b8 29-Dec-2014 Andy Hung <hunga@google.com> Fix assertEquals order

Change-Id: I0dac9fcb6f80bdff6678e361d3d2b70448d334e9
rc/android/media/cts/AudioTrackTest.java
9ec4fd44b5a7ecad4316e8eb8667b6bd2317c988 29-Dec-2014 Brian Carlstrom <bdc@google.com> am 0156ee1a: am ec5b666a: Fix build

* commit '0156ee1a0ed5663ff9d112f3ec4864bbfcddf034':
Fix build
52be35db2606177a12725e061f87f1c272d4c791 29-Dec-2014 Rachad <rachad@google.com> am 3278e2a6: am a72d35ac: Merge "Tunneled Video Playback CTS Tests" into lmp-mr1-dev

* commit '3278e2a6a828bd01d20ac4290aa9a2fb39e764a3':
Tunneled Video Playback CTS Tests
0156ee1a0ed5663ff9d112f3ec4864bbfcddf034 29-Dec-2014 Brian Carlstrom <bdc@google.com> am ec5b666a: Fix build

* commit 'ec5b666aa4d8ce941d2f9ac30a117091a158dd97':
Fix build
3278e2a6a828bd01d20ac4290aa9a2fb39e764a3 29-Dec-2014 Rachad <rachad@google.com> am a72d35ac: Merge "Tunneled Video Playback CTS Tests" into lmp-mr1-dev

* commit 'a72d35ac1f80ab78c0f0d83baa7c38344acb9bd2':
Tunneled Video Playback CTS Tests
5ce12f93f5c373e104ca2d0c6af5264d87ad953f 28-Dec-2014 Martin Storsjo <martin@martin.st> Test using getOutputImage for reading buffer contents

Only do this for every other frame, while testing the normal buffer
reading otherwise.

This would catch the fact that getOutputImage is broken in 64 bit
mode on ARM in the 5.0 release.

Change-Id: I66c0a02b7a89c3028e6ae7cb8c9e1162b783627b
rc/android/media/cts/EncodeDecodeTest.java
ec5b666aa4d8ce941d2f9ac30a117091a158dd97 24-Dec-2014 Brian Carlstrom <bdc@google.com> Fix build

Bug: 17883772
Change-Id: Iadaabf6915d30d46e69f457cc7af278aff7213d6
rc/android/media/cts/DecoderTest.java
9236bf3927aa03c32c714b1c8c84628fc7d150ef 24-Dec-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 56213945 to lmp-dev

Change-Id: Iafb105033d0b1cd3d1ed0b63232f68db5a4f2000
a72d35ac1f80ab78c0f0d83baa7c38344acb9bd2 24-Dec-2014 Rachad <rachad@google.com> Merge "Tunneled Video Playback CTS Tests" into lmp-mr1-dev
5621394507e32d3727e861f727fdf12dfdc7fb90 23-Dec-2014 Marco Nelissen <marcone@google.com> am dfa8b7c5: am 9cb1e0b8: am e4f0d04b: am ca3cc4d4: am 4cd3894f: am 869d2524: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit 'dfa8b7c50867aa0438cd2dd6e7bc99a181514c5b':
Add tests for midi playback
9cb1e0b8aa255cb7030a389750ff1db9d60cb2d3 23-Dec-2014 Marco Nelissen <marcone@google.com> am e4f0d04b: am ca3cc4d4: am 4cd3894f: am 869d2524: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit 'e4f0d04b3788e6295f9126481912956f4697592d':
Add tests for midi playback
e4f0d04b3788e6295f9126481912956f4697592d 23-Dec-2014 Marco Nelissen <marcone@google.com> am ca3cc4d4: am 4cd3894f: am 869d2524: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit 'ca3cc4d4529d4590dd60250cd622e41539eaeb6a':
Add tests for midi playback
ca3cc4d4529d4590dd60250cd622e41539eaeb6a 23-Dec-2014 Marco Nelissen <marcone@google.com> am 4cd3894f: am 869d2524: am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit '4cd3894f01fba8675ebdf07bfd910cc5e0fff407':
Add tests for midi playback
4e575d68bdf0082d419af9aedd3c00a655fe9f13 13-Dec-2014 Rachad <rachad@google.com> Tunneled Video Playback CTS Tests

Added CTS tests to DecoderTest.java to test Tunneled video playback.

Bug: 17883772

Change-Id: I31e30bf3f3808e742996bb370e9522f97cebb5ba
rc/android/media/cts/CodecState.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaCodecCencPlayer.java
rc/android/media/cts/MediaCodecTest.java
rc/android/media/cts/MediaCodecTunneledPlayer.java
rc/android/media/cts/MediaTimeProvider.java
rc/android/media/cts/NonBlockingAudioTrack.java
7733e4749d7b95f311a738d4224c2ec7dc694b8b 23-Dec-2014 Marco Nelissen <marcone@google.com> am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit 'e2247907a35dc8a5e127a2c40d9c3f720b021a33':
Add tests for midi playback
e2247907a35dc8a5e127a2c40d9c3f720b021a33 23-Dec-2014 Marco Nelissen <marcone@google.com> am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit 'a4163a070db3f4945db159eb12a205c357dc0a94':
Add tests for midi playback
85e52e51301468dae80355927972170d80361786 22-Dec-2014 Marco Nelissen <marcone@google.com> Add tests for midi playback

Change-Id: Ie2dd509870a89b2eec346e8e6cf1e80d727a1f9c
es/raw/midi8sec.mid
es/raw/midi_a.mid
es/raw/midi_b.mid
es/raw/midi_cs.mid
es/raw/midi_e.mid
es/raw/midi_gs.mid
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/SoundPoolMidiTest.java
ac5c60a3c476768bd08a737ca3b0c8f9f1dc928c 22-Dec-2014 Marco Nelissen <marcone@google.com> Add tests for midi playback

Change-Id: Ie2dd509870a89b2eec346e8e6cf1e80d727a1f9c
es/raw/midi8sec.mid
es/raw/midi_a.mid
es/raw/midi_b.mid
es/raw/midi_cs.mid
es/raw/midi_e.mid
es/raw/midi_gs.mid
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/SoundPoolMidiTest.java
f2b618b9997bedea7cf9b97163d9ab91a429d272 19-Dec-2014 Ronghua Wu <ronghuawu@google.com> am 0bfe16b1: am e6256ca5: Merge "cts: fix testAllNonTunneledVideoCodecsSupportFlexibleYUV" into lmp-mr1-dev

* commit '0bfe16b1dcb2ee8233f2da9415bd6ac03923eda0':
cts: fix testAllNonTunneledVideoCodecsSupportFlexibleYUV
0bfe16b1dcb2ee8233f2da9415bd6ac03923eda0 18-Dec-2014 Ronghua Wu <ronghuawu@google.com> am e6256ca5: Merge "cts: fix testAllNonTunneledVideoCodecsSupportFlexibleYUV" into lmp-mr1-dev

* commit 'e6256ca56b3133b3082a5f9046587a54d67e8112':
cts: fix testAllNonTunneledVideoCodecsSupportFlexibleYUV
507f70eafe963486431b33e77a73afaa48067947 17-Dec-2014 Ronghua Wu <ronghuawu@google.com> cts: fix testAllNonTunneledVideoCodecsSupportFlexibleYUV

Bug: 18740250
Change-Id: I51365c2f775e78d2696c364775aadda93472de3d
rc/android/media/cts/MediaCodecCapabilitiesTest.java
844624f31f882ddd574b7496f850c265fa043bfb 16-Dec-2014 Rachad Alao <rachad@google.com> am 5be8d874: am 58236b68: Merge "media: verify secure, adaptive and flexYUV video capabilities" into lmp-mr1-dev

* commit '5be8d8740403926dcc4eafd6dd1a70daa660755b':
media: verify secure, adaptive and flexYUV video capabilities
5be8d8740403926dcc4eafd6dd1a70daa660755b 16-Dec-2014 Rachad Alao <rachad@google.com> am 58236b68: Merge "media: verify secure, adaptive and flexYUV video capabilities" into lmp-mr1-dev

* commit '58236b6874c70063bba65dc79cc42268c6cfaa7a':
media: verify secure, adaptive and flexYUV video capabilities
58236b6874c70063bba65dc79cc42268c6cfaa7a 16-Dec-2014 Rachad Alao <rachad@google.com> Merge "media: verify secure, adaptive and flexYUV video capabilities" into lmp-mr1-dev
c6148708c97da720ba5086e45a911fb635941a97 16-Dec-2014 Ricardo Garcia <rago@google.com> am 9fa9f1d2: am ae34cf24: Merge "Fix for Visualizer CTS test: Wait for media to start playing" into lmp-mr1-dev

* commit '9fa9f1d2cd1220c0ed716098152b92c1ff1dc430':
Fix for Visualizer CTS test: Wait for media to start playing
9fa9f1d2cd1220c0ed716098152b92c1ff1dc430 16-Dec-2014 Ricardo Garcia <rago@google.com> am ae34cf24: Merge "Fix for Visualizer CTS test: Wait for media to start playing" into lmp-mr1-dev

* commit 'ae34cf24474e1de9a82ea7bcbaa7cc5618a09e7f':
Fix for Visualizer CTS test: Wait for media to start playing
ae34cf24474e1de9a82ea7bcbaa7cc5618a09e7f 16-Dec-2014 Ricardo Garcia <rago@google.com> Merge "Fix for Visualizer CTS test: Wait for media to start playing" into lmp-mr1-dev
907db86bce29298cad23c8408cfa5810d73b0cda 16-Dec-2014 Unsuk Jung <unsuk@google.com> am ee70e697: am 731c791e: Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev

* commit 'ee70e69744a7c525bbd959881187fe7c19386c15':
DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs
ee70e69744a7c525bbd959881187fe7c19386c15 16-Dec-2014 Unsuk Jung <unsuk@google.com> am 731c791e: Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev

* commit '731c791e73a9177c98402ae4ee341181110bf792':
DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs
cc4b6903845f95818c7ebb3eb3b8bf231ef98ce1 16-Dec-2014 Chong Zhang <chz@google.com> am 92ea38bd: VideoEncoderDecoderTest: use getImage() for YUV buffers

* commit '92ea38bde4d8c216c522a2c38c127eb3626e885d':
VideoEncoderDecoderTest: use getImage() for YUV buffers
92ea38bde4d8c216c522a2c38c127eb3626e885d 10-Dec-2014 Chong Zhang <chz@google.com> VideoEncoderDecoderTest: use getImage() for YUV buffers

Bug: 17966368

Change-Id: I1c011a41cefe43e56f5e8e025acc6b73c6dc4715
ndroid.mk
ibmediandkjni/Android.mk
ibmediandkjni/codec-utils-jni.cpp
ibmediandkjni/native-media-jni.cpp
rc/android/media/cts/CodecImage.java
rc/android/media/cts/CodecUtils.java
a743a25678ba04530169cd6525f0b6104e93071d 13-Dec-2014 Lajos Molnar <lajos@google.com> media: verify secure, adaptive and flexYUV video capabilities

Bug: 18513091
Bug: 18678462
Change-Id: Id2d4154d4cfdb3d15ae004088103b15ed799d38c
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/VideoEncoderTest.java
731c791e73a9177c98402ae4ee341181110bf792 13-Dec-2014 Unsuk Jung <unsuk@google.com> Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into lmp-sprout-dev
0e3d7bd8aaf1f0dfc0d051d86329c9148c9c78ab 13-Dec-2014 Ricardo Garcia <rago@google.com> am 22f8ff0e: Merge "Add Virtualizer audio effect tests for capabilities API" into lmp-mr1-dev

* commit '22f8ff0e309c34ae35d458fdfd2f458723f0f693':
Add Virtualizer audio effect tests for capabilities API
22f8ff0e309c34ae35d458fdfd2f458723f0f693 13-Dec-2014 Ricardo Garcia <rago@google.com> Merge "Add Virtualizer audio effect tests for capabilities API" into lmp-mr1-dev
8b08d9999d63c4fed24ad69431542641039c93f5 12-Dec-2014 Lajos Molnar <lajos@google.com> am ac73de92: Merge "media: add tests to validate encoding profiles defined by CDD." into lmp-mr1-dev

* commit 'ac73de92ec433be6add51d55433cad90c2a44a3e':
media: add tests to validate encoding profiles defined by CDD.
cfcc8c491968c9efffb9ffd787981e98f5cf9914 12-Dec-2014 Lajos Molnar <lajos@google.com> am 0a22e70c: media: test HEVC Main10 only on TVs, test for AAC 8kHz encoder

* commit '0a22e70cfa80f1cbf3840855a40f1b8d14611974':
media: test HEVC Main10 only on TVs, test for AAC 8kHz encoder
dffc27a84f06ecab9b715df6f6f6cbd56b958a98 12-Dec-2014 Lajos Molnar <lajos@google.com> am 56ff8e31: Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"

* commit '56ff8e31cf8f979dae1b147810ef2471a6b68ad8':
Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"
ac73de92ec433be6add51d55433cad90c2a44a3e 12-Dec-2014 Lajos Molnar <lajos@google.com> Merge "media: add tests to validate encoding profiles defined by CDD." into lmp-mr1-dev
a9396bdf0882fb48d943cb17761ff83a81c1ffb9 12-Dec-2014 Ronghua Wu <ronghuawu@google.com> am 3a7b868b: am 827a895c: media: fix vp9 decode test stream

* commit '3a7b868bf8df2dcb71ace2404bd27921dae17526':
media: fix vp9 decode test stream
0a22e70cfa80f1cbf3840855a40f1b8d14611974 12-Dec-2014 Lajos Molnar <lajos@google.com> media: test HEVC Main10 only on TVs, test for AAC 8kHz encoder

According to latest CDD

Bug: 18715668
Change-Id: Ie2d73c6026b1033e679169227849a318f6007d8f
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecListTest.java
56ff8e31cf8f979dae1b147810ef2471a6b68ad8 11-Dec-2014 Lajos Molnar <lajos@google.com> Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"

This reverts commit 484b0887a1537de67023bd4a0ff8896ae084cff7.
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecTest.java
3a7b868bf8df2dcb71ace2404bd27921dae17526 11-Dec-2014 Ronghua Wu <ronghuawu@google.com> am 827a895c: media: fix vp9 decode test stream

* commit '827a895c71c456354fc232f2e6e5fe6bb2e024b6':
media: fix vp9 decode test stream
79bfc5ea1890c6bf3bd406a20ec11d1ae96ec303 11-Dec-2014 Lajos Molnar <lajos@google.com> am 1e8e295e: Merge "media: test both 44.1 and 48 kHz vorbis files" into lmp-mr1-dev

* commit '1e8e295e5a8e94c0b14719771fbeb74967b74396':
media: test both 44.1 and 48 kHz vorbis files
827a895c71c456354fc232f2e6e5fe6bb2e024b6 11-Dec-2014 Ronghua Wu <ronghuawu@google.com> media: fix vp9 decode test stream

Bug: 18687994
Change-Id: I2fe3f767c3dded2216dc75a237a86797b79e4a3e
es/raw/video_480x360_webm_vp9_333kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
c8305144ce5d9a7c7c252a1397495a07b985359b 11-Dec-2014 Chih-Hung Hsieh <chh@google.com> am 3551f488: Merge "Use dynamic allocation for non-POD arrays."

* commit '3551f488f171a868ce2c1d18dc1086f6cae2158f':
Use dynamic allocation for non-POD arrays.
1e8e295e5a8e94c0b14719771fbeb74967b74396 11-Dec-2014 Lajos Molnar <lajos@google.com> Merge "media: test both 44.1 and 48 kHz vorbis files" into lmp-mr1-dev
c7038be1e6613cae57b928d12d8487467d0e0ea0 10-Dec-2014 Chih-Hung Hsieh <chh@google.com> Use dynamic allocation for non-POD arrays.

Clang reported error about allocating variable length array of non-POD
element type 'simplevector<int>'
Also fix one missing delete bug.

BUG: 18702945
Change-Id: I9e0908db0db96d31bd2cdf3d8c303cdb8cf59614
ibmediandkjni/native-media-jni.cpp
5492baa6daddba56603fd9f6d1cdf36a23de5a11 20-May-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs

(cherry picked from commit e5768fcc64369eaf18ae8bf7ef197eedc4510fb6)
Updated for API 20

Bug: 15081617
Change-Id: Ia9425600764f581cdc1977b54f2e774dbabdadd0
(cherry picked from commit 1f15761623ae95a4a77cafdca057063e16f53a18)
rc/android/media/cts/AdaptivePlaybackTest.java
954d047463f289dfdd09ad7d0c894d2f23995530 10-Dec-2014 Ricardo Garcia <rago@google.com> Fix for Visualizer CTS test: Wait for media to start playing

In some cases the media player might take longer to start playback and the test was
failing. Using MediaPlayer api to check when enough data has played to make
visualizer measurements

bug: 18610264
Change-Id: I9b0c0d91ba1a9a6319800bce9281eb3bf7e5ccac
rc/android/media/cts/VisualizerTest.java
1dcd1d07363c7d92e1fe4cf832af502f6f99fc8f 10-Dec-2014 Lajos Molnar <lajos@google.com> am c4b42328: am df1c6d45: media: don\'t test video decoders & encoders on watch devices

* commit 'c4b423289fc8ca283e335cc62986d7ff879edf5f':
media: don't test video decoders & encoders on watch devices
c4b423289fc8ca283e335cc62986d7ff879edf5f 09-Dec-2014 Lajos Molnar <lajos@google.com> am df1c6d45: media: don\'t test video decoders & encoders on watch devices

* commit 'df1c6d45f64d6f7b33a84bc1b089754cdbeaa4d2':
media: don't test video decoders & encoders on watch devices
9436a2db74b6c1494ee2f6d508afa6644ac78c19 06-Dec-2014 Lajos Molnar <lajos@google.com> media: test both 44.1 and 48 kHz vorbis files

Bug: 18615604
Change-Id: I41f13123f048d31961d1aed93a10f84fa28d7c3b
ssets/noiseandchirps.ogg
es/raw/video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp9_4096kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp9_4096kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_60fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/NativeDecoderTest.java
df1c6d45f64d6f7b33a84bc1b089754cdbeaa4d2 08-Dec-2014 Lajos Molnar <lajos@google.com> media: don't test video decoders & encoders on watch devices

This patch includes additional fixes for CTS tests that are still
run on watch devices.

Bug: 18664566
Change-Id: Ia69b76a781a1eff8e109e07f4176b1860b6454e7
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
929434199a81b9b11dc40ee182c73e04b79af399 08-Dec-2014 Lajos Molnar <lajos@google.com> am 9c67c8e4: Merge "Select common codecs for MediaCodecTest.testException" into lmp-mr1-dev

* commit '9c67c8e43de22deaa4dcb4ad2c6af4286e5227b1':
Select common codecs for MediaCodecTest.testException
8eb56bae713fa13270d7f622df2233d04710ce10 08-Dec-2014 Ronghua Wu <ronghuawu@google.com> am 6f1bc970: Merge "media: fix 4k hevc test stream" into lmp-mr1-dev

* commit '6f1bc9701829561be5c8fefdee2fb5a121a29a0e':
media: fix 4k hevc test stream
9232e2bda19146dad188055cd0050a93bfe8105c 08-Dec-2014 Lajos Molnar <lajos@google.com> am b4198f29: am baf4543e: Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev

* commit 'b4198f29e1dd97a26f505499dc7054f36d90c2e1':
DO NOT MERGE: media: CTS workarounds for framework bugs
83de922bb51b620b6a09ccc5995f6a4768a5b4e4 08-Dec-2014 Lajos Molnar <lajos@google.com> am 7752e51c: am 075ea8aa: Merge "media: change vorbis samples to 48kHz" into lmp-sprout-dev

* commit '7752e51cf504a7492f740748beced02dfbad360e':
media: change vorbis samples to 48kHz
e74e61c93c26c56ca3da8cfa102b32faa8577974 08-Dec-2014 Lajos Molnar <lajos@google.com> am 8f037002: am f518d4e9: Merge "media: run media tests based on device type and support" into lmp-sprout-dev

* commit '8f037002d11affbec6cb5d79d68dfab4ddfe5783':
media: run media tests based on device type and support
71d420a570be759e534d26c808625b0d1a687aa4 08-Dec-2014 Daniel Cardenas <danielcar@google.com> am 891d8d15: Merge "Fix merge conflict in cts test AudioManagerTest.java" into lmp-mr1-dev

* commit '891d8d159695288c82b6219bf1af0550891e0945':
Fix AudioManagerTest to handle TVs that don't vibrate and lack ringer functionality.
e996d6a9f2bc61a8d89e71c373f726c8c7a471e4 08-Dec-2014 Lajos Molnar <lajos@google.com> am 841d092c: Merge "media: attempt to play back encoded files" into lmp-mr1-dev

* commit '841d092ccb078b687f24a3b7ed24fcee8309d618':
media: attempt to play back encoded files
3895a8db4502a0fca6f5feb0184eb1ff0b4f8cfd 08-Dec-2014 Ricardo Garcia <rago@google.com> am 807f2edb: Fix for LoudnessEnhancer test. Assert failing in float value.

* commit '807f2edb96a781c59fd5011939f6f9c0e502de90':
Fix for LoudnessEnhancer test. Assert failing in float value.
9c67c8e43de22deaa4dcb4ad2c6af4286e5227b1 06-Dec-2014 Lajos Molnar <lajos@google.com> Merge "Select common codecs for MediaCodecTest.testException" into lmp-mr1-dev
7e213007e60f05b029eba033e1b0c504c2660809 17-Nov-2014 Ronghua Wu <ronghuawu@google.com> media: add tests to validate encoding profiles defined by CDD.

Bug: 18355427
Change-Id: I644814cdcbd58573d93bfb866436089d1aa9ab82
rc/android/media/cts/VideoEncoderTest.java
38414d5c426713a1ca2f642faeb3b7ca89881897 04-Dec-2014 Ronghua Wu <ronghuawu@google.com> DO NOT MERGE: media: fix 4k hevc test stream

Bug: 18355427
Change-Id: I5c5b38e6680bdd648273a3b4a2327f9c9a0a5b91
(cherry picked from commit 993e0e230f7d28a0889c83d17386ec21f9cf9c50)
es/raw/video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_3840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
6f1bc9701829561be5c8fefdee2fb5a121a29a0e 05-Dec-2014 Ronghua Wu <ronghuawu@google.com> Merge "media: fix 4k hevc test stream" into lmp-mr1-dev
b4198f29e1dd97a26f505499dc7054f36d90c2e1 05-Dec-2014 Lajos Molnar <lajos@google.com> am baf4543e: Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev

* commit 'baf4543e8950c4430647ef65f62274eba121dd13':
DO NOT MERGE: media: CTS workarounds for framework bugs
5b12251eeabbc7edb7460cb90735e9405bb3a2f9 05-Dec-2014 Jason Parks <jparks@google.com> am 60a1ecf0: am 78394957: Merge "Fix MediaRecorderTest to test for encoders." into lmp-sprout-dev

* commit '60a1ecf022a68d78d4a0e0b26fcb2772638de31c':
Fix MediaRecorderTest to test for encoders.
993e0e230f7d28a0889c83d17386ec21f9cf9c50 04-Dec-2014 Ronghua Wu <ronghuawu@google.com> media: fix 4k hevc test stream

Bug: 18355427
Change-Id: I5c5b38e6680bdd648273a3b4a2327f9c9a0a5b91
es/raw/video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_3840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
484b0887a1537de67023bd4a0ff8896ae084cff7 05-Dec-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: media: CTS workarounds for framework bugs

Bug: 18473065

Change-Id: I31c2b47b2dd5606f56ee65ea7bb514241f5ec145
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecTest.java
0882c73fc2fb7784ddcc179d25689f6e98769127 20-Nov-2014 Jean-Michel Trivi <jmtrivi@google.com> Add Virtualizer audio effect tests for capabilities API

Exercise the android.media.audiofx.Virtualizer API for querying
and controlling the behavior of a Virtualizer implementation.
Consider Virtualizers that report no valid configuration as
incompatible.

bug: 18538537

Change-Id: Iacb3a43e6cfee709b1d481ee4854da44531248eb
rc/android/media/cts/PostProcTestBase.java
rc/android/media/cts/VirtualizerTest.java
7752e51cf504a7492f740748beced02dfbad360e 05-Dec-2014 Lajos Molnar <lajos@google.com> am 075ea8aa: Merge "media: change vorbis samples to 48kHz" into lmp-sprout-dev

* commit '075ea8aae48ff751c27d6f99f27324276d39f9b5':
media: change vorbis samples to 48kHz
8f037002d11affbec6cb5d79d68dfab4ddfe5783 05-Dec-2014 Lajos Molnar <lajos@google.com> am f518d4e9: Merge "media: run media tests based on device type and support" into lmp-sprout-dev

* commit 'f518d4e9f71aac4f95539dfa20a694f0c2629e5f':
media: run media tests based on device type and support
891d8d159695288c82b6219bf1af0550891e0945 05-Dec-2014 Daniel Cardenas <danielcar@google.com> Merge "Fix merge conflict in cts test AudioManagerTest.java" into lmp-mr1-dev
07d210c6b66022d8744c09986406f9bf48ac6a22 05-Dec-2014 Daniel Cardenas <danielcar@google.com> Fix merge conflict in cts test AudioManagerTest.java

Change-Id: Icebe53009b557e4e23c0c717df5b87b8cec85bc4
841d092ccb078b687f24a3b7ed24fcee8309d618 05-Dec-2014 Lajos Molnar <lajos@google.com> Merge "media: attempt to play back encoded files" into lmp-mr1-dev
075ea8aae48ff751c27d6f99f27324276d39f9b5 05-Dec-2014 Lajos Molnar <lajos@google.com> Merge "media: change vorbis samples to 48kHz" into lmp-sprout-dev
f518d4e9f71aac4f95539dfa20a694f0c2629e5f 05-Dec-2014 Lajos Molnar <lajos@google.com> Merge "media: run media tests based on device type and support" into lmp-sprout-dev
6905206a302361743545fb6464efc51fdffcc2aa 06-Nov-2014 Daniel Cardenas <danielcar@google.com> Fix AudioManagerTest to handle TVs that don't vibrate and lack ringer
functionality.

Details: Running AudioManagerTest fails because TVs don't have vibration
feature and setRingerMode is disabled in AudioService.java. So skip
affected tests..

Previous CL comments are here:
https://googleplex-android-review.git.corp.google.com/#/c/582796/

Bug: 17547824
Change-Id: I1ec5d803e5a079225f63da5285985be6006c1de7
rc/android/media/cts/AudioManagerTest.java
807f2edb96a781c59fd5011939f6f9c0e502de90 03-Dec-2014 Ricardo Garcia <rago@google.com> Fix for LoudnessEnhancer test. Assert failing in float value.

The test was comparing (int)0 with a float, and the resulting
0.0 was failing the test. Replaced ints with floats in 2 tests.

bug: 18595319
Change-Id: I626afac691a5d93dbf52cd0e1c9c894a1c5f2908
rc/android/media/cts/LoudnessEnhancerTest.java
60a1ecf022a68d78d4a0e0b26fcb2772638de31c 04-Dec-2014 Jason Parks <jparks@google.com> am 78394957: Merge "Fix MediaRecorderTest to test for encoders." into lmp-sprout-dev

* commit '783949572cf0dfc04020da85a66da64c072504f1':
Fix MediaRecorderTest to test for encoders.
2ceee5f88c3025c16a2e63e085c0723047664b97 04-Dec-2014 Lajos Molnar <lajos@google.com> media: attempt to play back encoded files

Bug: 18513091
Change-Id: I5526951b04a30152a066881e630c1347e27d0843
rc/android/media/cts/VideoEncoderTest.java
99673d3172f3adae140222e79ea3d95fcc1a2a5c 04-Dec-2014 Lajos Molnar <lajos@google.com> media: change vorbis samples to 48kHz

Android 5.0 does not advertise support for these.

Bug: 18615604
Change-Id: Ib984cbf015beac79d3b762ed223d6f052fc153db
ssets/noiseandchirps.ogg
es/raw/video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_60fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp9_309kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp9_309kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1280x720_webm_vp9_4096kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp9_4096kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_60fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_1920x1080_webm_vp9_10240kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp9_10240kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_320x240_webm_vp9_600kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_320x240_webm_vp9_600kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_3840x2160_webm_vp9_20480kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_3840x2160_webm_vp9_20480kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_480x360_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_480x360_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_480x360_webm_vp9_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_480x360_webm_vp9_333kbps_25fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_640x360_webm_vp8_2048kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_640x360_webm_vp8_2048kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
es/raw/video_640x360_webm_vp9_1638kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_640x360_webm_vp9_1638kbps_30fps_vorbis_stereo_128kbps_48000hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/NativeDecoderTest.java
d2be1693f09bca8ce37f945f3e342eb37444d774 04-Dec-2014 Lajos Molnar <lajos@google.com> media: run media tests based on device type and support

- list required codec types by device type
- test playback based on format-specific decoder support

Bug: 18465895
Change-Id: I6eb387cea004e92e772d8bfc3921078ec3ba5727
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/ImageReaderDecoderTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaCodecTest.java
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
rc/android/media/cts/MediaRecorderTest.java
rc/android/media/cts/NativeDecoderTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
380a0c49847776707abc578cf9883441b898a00c 04-Dec-2014 Lajos Molnar <lajos@google.com> Merge changes I5ffb1399,I2333765e,I64ca4e29,I6f393150 into lmp-sprout-dev

* changes:
media: centralize signaling of skipped tests
media: update MediaCodecList handling to API 21
cts: add tests to validate decoding profiles defined by CDD.
cts: validate h264 and h265 codec profiles and level requirements.
8143153cef876e2b14eb6d170cab85d6973349f1 26-Nov-2014 Andy Hung <hunga@google.com> Select common codecs for MediaCodecTest.testException

Changed audio codec (decoder) from AMR-WB to MP3
as should be available on more Android devices.
Allow testing to proceed even if some codecs are not available.

Bug: 18349242
Change-Id: Ia2fe17f555f69e94a652069e20aa9848fdd0ec7e
rc/android/media/cts/MediaCodecTest.java
ba5cb90a0866f6036657d8ebe3fcc5a9483acfd7 05-Nov-2014 Lajos Molnar <lajos@google.com> media: update MediaCodecList handling to API 21

- check for codec capabilities using MediaCodecList.findEn/Decoder
- add android.cts.util.MediaUtils

Bug: 18514657
Change-Id: I2333765ee17bb8059ea466585bebb63378f47464
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/EncoderTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaCodecTest.java
rc/android/media/cts/MediaMuxerTest.java
rc/android/media/cts/Vp8CodecTestBase.java
rc/android/media/cts/Vp8EncoderTest.java
67341b969bc7fa1a505eb5b81bdabdf12692294a 14-Nov-2014 Ronghua Wu <ronghuawu@google.com> cts: add tests to validate decoding profiles defined by CDD.

Bug: 18355427
Change-Id: I64ca4e29ff8c85f0c740656cd9219e7bf70893dd
es/raw/video_1280x720_mp4_h264_8192kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_mp4_h264_8192kbps_60fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_mp4_hevc_4096kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_webm_vp8_8192kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp9_4096kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_mp4_h264_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1920x1080_mp4_h264_20480kbps_60fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1920x1080_mp4_hevc_10240kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1920x1080_webm_vp8_20480kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp9_10240kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_320x240_mp4_h264_800kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_320x240_webm_vp9_600kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_352x288_mp4_hevc_600kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_3840x2160_webm_vp9_20480kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_640x360_webm_vp8_2048kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_640x360_webm_vp9_1638kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_720x480_mp4_h264_2048kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_720x480_mp4_hevc_1638kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaPlayerTestBase.java
4b06bd5011c7ea0589f614e8c5b5a455ad93fe4d 13-Nov-2014 Ronghua Wu <ronghuawu@google.com> cts: validate h264 and h265 codec profiles and level requirements.

Bug: 18355427
Change-Id: I6f3931500367de829e220897249386ce93a78443
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaPlayerTestBase.java
3fff876c57de339ad9d0ff8c0cae3eb98f270aaf 03-Dec-2014 Jason Parks <jparks@google.com> Fix MediaRecorderTest to test for encoders.

Change-Id: Ibd2d76a965c6f355f518407539de764563ab4cd4
rc/android/media/cts/MediaRecorderTest.java
b255633142f05a3b59043badb7020e1542b321b5 01-Dec-2014 Jason Parks <jparks@google.com> am 1689c73e: am b72cdbdc: Merge "Fix MediaRecorderTest failures." into lmp-sprout-dev

* commit '1689c73e5b0c7767757f5faba74e5433471d54e9':
Fix MediaRecorderTest failures.
1689c73e5b0c7767757f5faba74e5433471d54e9 01-Dec-2014 Jason Parks <jparks@google.com> am b72cdbdc: Merge "Fix MediaRecorderTest failures." into lmp-sprout-dev

* commit 'b72cdbdc8cbd3c146ac62e0c6831adba656681e5':
Fix MediaRecorderTest failures.
a051c6e1ae9b12167caac43d3fd25140c1342a7c 01-Dec-2014 Jason Parks <jparks@google.com> am 0134fb57: am aea823b0: Fix failure in testMuxer().

* commit '0134fb57ec494d9e57219cd607d24d3a0bc13e19':
Fix failure in testMuxer().
0134fb57ec494d9e57219cd607d24d3a0bc13e19 01-Dec-2014 Jason Parks <jparks@google.com> am aea823b0: Fix failure in testMuxer().

* commit 'aea823b0eb88a585e66019202945316a33a8934c':
Fix failure in testMuxer().
3ef837175dd9f5485f41e780612d59ef9aceda49 21-Nov-2014 Jason Parks <jparks@google.com> Fix MediaRecorderTest failures.

Bug: 18256010
Change-Id: I9235515a69a91677a9b201e81f708db69a729fd9
rc/android/media/cts/MediaRecorderTest.java
aea823b0eb88a585e66019202945316a33a8934c 26-Nov-2014 Jason Parks <jparks@google.com> Fix failure in testMuxer().

Bug: 18256010
Change-Id: Ia00bff88c8ef887573a7a59ccc278c478bf80efa
rc/android/media/cts/NativeDecoderTest.java
d1bf00107db219361764f87304d7139afe8d2ce3 27-Nov-2014 Andy Hung <hunga@google.com> am 13a80569: Merge "Add CTS test for static AudioTrack playback" into lmp-mr1-dev

* commit '13a80569d79e20a897a3e0f047fac44d1e2c2da2':
Add CTS test for static AudioTrack playback
13a80569d79e20a897a3e0f047fac44d1e2c2da2 27-Nov-2014 Andy Hung <hunga@google.com> Merge "Add CTS test for static AudioTrack playback" into lmp-mr1-dev
0a19f4ca706de9f99d4f6620e50687227a1f6be3 26-Nov-2014 Lajos Molnar <lajos@google.com> am 33110aa0: Merge "media: add VideoEncoderTest" into lmp-mr1-dev

* commit '33110aa0d8be316fa1f1283b7bf4494c6d6a4d3e':
media: add VideoEncoderTest
ed9fa5a8a1529e2c20dd3bd2c279df9c92c0aad1 26-Nov-2014 Takayuki Hoshi <hoshi@google.com> am 8e302be9: Merge "Fix AudioManagerTest#testVolume" into lmp-mr1-dev

* commit '8e302be9eb7424d7cc9aca2ab59686f722538207':
Fix AudioManagerTest#testVolume
33110aa0d8be316fa1f1283b7bf4494c6d6a4d3e 26-Nov-2014 Lajos Molnar <lajos@google.com> Merge "media: add VideoEncoderTest" into lmp-mr1-dev
8e302be9eb7424d7cc9aca2ab59686f722538207 26-Nov-2014 Takayuki Hoshi <hoshi@google.com> Merge "Fix AudioManagerTest#testVolume" into lmp-mr1-dev
df1525e776ebae2075a6cee78337bff40e6cba47 25-Nov-2014 Lajos Molnar <lajos@google.com> resolved conflicts for merge of 85bbb7c3 to lmp-mr1-dev-plus-aosp

Change-Id: Iab84a6f2aface8611d22efdf64ea888709e4c376
23949c57f01dc00e5ef48b58f2f2358a05af8b64 21-Nov-2014 Lajos Molnar <lajos@google.com> media: add VideoEncoderTest

This test exercises the range of sizes supported by each video encoder.

This is also a test for asynchronous video decoding and encoding.

Bug: 18513091
Change-Id: Ibacfc37f74ac3fd1ae634ae3de8d2064cff620f3
ibmediandkjni/Android.mk
ibmediandkjni/codec-utils-jni.cpp
es/raw/video_480x360_mp4_h264_871kbps_30fps.mp4
rc/android/media/cts/CodecUtils.java
rc/android/media/cts/OutputSurface.java
rc/android/media/cts/VideoEncoderTest.java
6c9ce33d35a5cb0b218b74188e549ac2fdb6a83b 25-Nov-2014 Lajos Molnar <lajos@google.com> am 55354b66: Merge "cts: add tests to validate decoding profiles defined by CDD." into lmp-mr1-dev

* commit '55354b662ef57e4f2fa409f4ab1a63f816bd586c':
cts: add tests to validate decoding profiles defined by CDD.
85bbb7c3d8c9e6e55c0147fd1627e4eefaf6b865 05-Nov-2014 Lajos Molnar <lajos@google.com> media: update MediaCodecList handling to API 21

- check for codec capabilities using MediaCodecList.findEn/Decoder
- add android.cts.util.MediaUtils

Bug: 18514657
Change-Id: I2333765ee17bb8059ea466585bebb63378f47464
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/EncoderTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaCodecTest.java
rc/android/media/cts/MediaMuxerTest.java
rc/android/media/cts/Vp8CodecTestBase.java
rc/android/media/cts/Vp8EncoderTest.java
55354b662ef57e4f2fa409f4ab1a63f816bd586c 25-Nov-2014 Lajos Molnar <lajos@google.com> Merge "cts: add tests to validate decoding profiles defined by CDD." into lmp-mr1-dev
d0697c1aa473092cdf5f432a81ed2781f219f354 19-Nov-2014 Andy Hung <hunga@google.com> Add CTS test for static AudioTrack playback

Bug: 18446245
Change-Id: Ia4f8cb3b969d9eab41df222f68a908e35959cbe1
rc/android/media/cts/AudioTrackTest.java
616a9a54a0048acf184a0d9740cab72fd7fac105 24-Nov-2014 Jason Parks <jparks@google.com> am 6871bb39: am f912a16f: Test for the codecs in the MediaPlayerFlakyNetworkTests.

* commit '6871bb39acb58303ea19e2e9179c268db65b5cf3':
Test for the codecs in the MediaPlayerFlakyNetworkTests.
e6f8e446b7caa8a2349b17b6ce62847af2181c67 22-Nov-2014 Jason Parks <jparks@google.com> am 10d0da83: am e6ad305e: Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev

* commit '10d0da837c4f9d5396e1ff09a7e4cdb502e1c596':
Skip ImageReaderDecoderTest if h.264 is not found.
6871bb39acb58303ea19e2e9179c268db65b5cf3 22-Nov-2014 Jason Parks <jparks@google.com> am f912a16f: Test for the codecs in the MediaPlayerFlakyNetworkTests.

* commit 'f912a16fd93286779b00775867be346a854fb130':
Test for the codecs in the MediaPlayerFlakyNetworkTests.
10d0da837c4f9d5396e1ff09a7e4cdb502e1c596 22-Nov-2014 Jason Parks <jparks@google.com> am e6ad305e: Merge "Skip ImageReaderDecoderTest if h.264 is not found." into lmp-sprout-dev

* commit 'e6ad305e8da121f44680a67e0e3dc7cb76f9d2b5':
Skip ImageReaderDecoderTest if h.264 is not found.
9397e28a151694923cd5df6a37711eb4af8adeeb 14-Nov-2014 Ronghua Wu <ronghuawu@google.com> cts: add tests to validate decoding profiles defined by CDD.

Bug: 18355427
Change-Id: I64ca4e29ff8c85f0c740656cd9219e7bf70893dd
es/raw/video_1280x720_mp4_h264_8192kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_mp4_h264_8192kbps_60fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_mp4_hevc_4096kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_webm_vp8_8192kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp8_8192kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp9_4096kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_mp4_h264_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1920x1080_mp4_h264_20480kbps_60fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1920x1080_mp4_hevc_10240kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1920x1080_webm_vp8_20480kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp8_20480kbps_60fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1920x1080_webm_vp9_10240kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_2840x2160_mp4_hevc_20480kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_320x240_mp4_h264_800kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_320x240_webm_vp9_600kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_352x288_mp4_hevc_600kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_3840x2160_webm_vp9_20480kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_640x360_webm_vp8_2048kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_640x360_webm_vp9_1638kbps_30fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_720x480_mp4_h264_2048kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_720x480_mp4_hevc_1638kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaPlayerTestBase.java
f912a16fd93286779b00775867be346a854fb130 21-Nov-2014 Jason Parks <jparks@google.com> Test for the codecs in the MediaPlayerFlakyNetworkTests.

Bug: 18256010
Change-Id: Icae67d1242ab3d1c1f930e07722a8a0130ebdf77
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
83d4c8aee547aef03b0cc60d219b60878ce611e7 21-Nov-2014 Ronghua Wu <ronghuawu@google.com> am 47a356f5: Merge "cts: validate h264 and h265 codec profiles and level requirements." into lmp-mr1-dev

* commit '47a356f585dd2211529b636985ac0d27b792b681':
cts: validate h264 and h265 codec profiles and level requirements.
47a356f585dd2211529b636985ac0d27b792b681 21-Nov-2014 Ronghua Wu <ronghuawu@google.com> Merge "cts: validate h264 and h265 codec profiles and level requirements." into lmp-mr1-dev
a808efe57297b3d0b6c6f06582f6e98442bf4674 20-Nov-2014 Jason Parks <jparks@google.com> Skip ImageReaderDecoderTest if h.264 is not found.

Bug: 18256010
Change-Id: I122b3e430de1eef794e7d5e7a2f8a647600eac21
rc/android/media/cts/ImageReaderDecoderTest.java
1f422519ad91a07ec41afcebe3e9c099eafd5901 10-Nov-2014 Takayuki Hoshi <hoshi@google.com> Fix AudioManagerTest#testVolume

AudioManagerTest's testVolume does not take into account
config_masterVolumeRamp values. This makes the test fail on
Android devices with different config_masterVolumeRamp value
other than 1; indeed, currently it is set to 5 by
default. This CL fixes the issue.

Note: There seems to be a bug under Nexus 5 that
.adjustVolume(ADJUST_LOWER, 0) does not lower the volume by
delta (only by 1) even though ADJUST_RAISE does work. The
issue will be addressed in a separate bug.

Change-Id: I7d6988b0210102cc4f1bc2ee42d845208fefe40b
rc/android/media/cts/AudioManagerTest.java
82d3032e3ab8bb3d07f2089f8431f16c4e38c229 13-Nov-2014 Ronghua Wu <ronghuawu@google.com> cts: validate h264 and h265 codec profiles and level requirements.

Bug: 18355427
Change-Id: I6f3931500367de829e220897249386ce93a78443
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaPlayerTestBase.java
51505f186718f73c4a6ded19cc4a940e8f9d2420 19-Nov-2014 Jason Parks <jparks@google.com> am ed49f730: am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev

* commit 'ed49f730046a2fa6282dc5561bcdcc5b603dcbe6':
Fix failing CTS tests.
ed49f730046a2fa6282dc5561bcdcc5b603dcbe6 19-Nov-2014 Jason Parks <jparks@google.com> am 8a893be3: Merge "Fix failing CTS tests." into lmp-sprout-dev

* commit '8a893be3f8c00e65a4c45c9615b3f6b547579cd5':
Fix failing CTS tests.
8a893be3f8c00e65a4c45c9615b3f6b547579cd5 19-Nov-2014 Jason Parks <jparks@google.com> Merge "Fix failing CTS tests." into lmp-sprout-dev
cd777f6b3d6c5d54035284b29bb55c5c664dd142 19-Nov-2014 Zhijun He <zhijunhe@google.com> am 2edb1c90: am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev

* commit '2edb1c90fdc11b782f9e3b88f96ff6d2327b1347':
CamcorderProfile: guard unknown profile qualities
2edb1c90fdc11b782f9e3b88f96ff6d2327b1347 19-Nov-2014 Zhijun He <zhijunhe@google.com> am 9610d4a3: Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev

* commit '9610d4a348e51e16c5c61c216b6afde6df0e5bb3':
CamcorderProfile: guard unknown profile qualities
9610d4a348e51e16c5c61c216b6afde6df0e5bb3 19-Nov-2014 Zhijun He <zhijunhe@google.com> Merge "CamcorderProfile: guard unknown profile qualities" into lmp-sprout-dev
912ecbe8cb7c20f11cac9491e5e311634bb005d1 18-Nov-2014 Jason Parks <jparks@google.com> am b1c0169a: am 74b936fb: Fix failing CTS tests.

* commit 'b1c0169a4f6b78d705cec843634cbf1dfbef4d48':
Fix failing CTS tests.
b1c0169a4f6b78d705cec843634cbf1dfbef4d48 18-Nov-2014 Jason Parks <jparks@google.com> am 74b936fb: Fix failing CTS tests.

* commit '74b936fbc59f81f296f5c6a3453c29785f9913ac':
Fix failing CTS tests.
61765d88c2aaf42e7f5b2d66e75abbe6167e80e4 17-Nov-2014 Jason Parks <jparks@google.com> Fix failing CTS tests.

Bug: 18256010
Change-Id: I096288fbb33e98fbca1854788569ecf875456dbe
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
74b936fbc59f81f296f5c6a3453c29785f9913ac 17-Nov-2014 Jason Parks <jparks@google.com> Fix failing CTS tests.

Bug: 18256010
Change-Id: I4103f34f409451caf051ffe4b6e197942896db93
rc/android/media/cts/EnvReverbTest.java
406b212c72c6aeab7fbf59c78a9738697a028dbc 18-Nov-2014 Jason Parks <jparks@google.com> am f17bdf43: am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev

* commit 'f17bdf43eb80c0d662382c21d9273e1d2aeb3538':
Fix various Wear media CTS failures.
f17bdf43eb80c0d662382c21d9273e1d2aeb3538 17-Nov-2014 Jason Parks <jparks@google.com> am 336efd31: Merge "Fix various Wear media CTS failures." into lmp-sprout-dev

* commit '336efd3166534cb44ad2be876ba7f8ea30db65c7':
Fix various Wear media CTS failures.
c5076ab78c74cec187ab011ad05c76b370251010 05-Nov-2014 Zhijun He <zhijunhe@google.com> CamcorderProfile: guard unknown profile qualities

Some unknown CamcorderProfiles may be added in the public API by some entities.
This may create API constant collision to future android releases. we need
guard this in CTS.

Bug: 18173733
Change-Id: I529d0b03a14d26f745de304f7e24b683ed0d5a08
rc/android/media/cts/CamcorderProfileTest.java
6340ecadcc0df9e3f658ef58cfac2cbc2da4dbef 12-Nov-2014 Jason Parks <jparks@google.com> Fix various Wear media CTS failures.

- Rework MedaiPlayerTestBase to include common methods
- Fix MediaPlayerTest failures
- Fix StreamingMediaPlayerTest failures.
- Fix crashes in NativeDecoderTest.

Bug: 18256010
Change-Id: I6f7eb854537c807be40df44d34b7d55b1379a804
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
rc/android/media/cts/NativeDecoderTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
f842b501c1cb208d7506db41f23fc6ee366749c4 17-Nov-2014 Jason Parks <jparks@google.com> am d45c0f23: am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output.

* commit 'd45c0f230ae7c07ffeeec367e6747aec5faa3c71':
Don’t run RingtoneMangerTest tests on devices without audio output.
1cda097bdc3df3d8392de0deebb78915110b5ea8 17-Nov-2014 Jason Parks <jparks@google.com> am c6fb89c2: am f9e09d47: Don’t run Ringtone test if the devices without audio output.

* commit 'c6fb89c2b17b31316dc1c842951a2b421aba3650':
Don’t run Ringtone test if the devices without audio output.
d45c0f230ae7c07ffeeec367e6747aec5faa3c71 17-Nov-2014 Jason Parks <jparks@google.com> am 1b16d5ce: Don’t run RingtoneMangerTest tests on devices without audio output.

* commit '1b16d5ced284c1341c6bf3003f39027083053e30':
Don’t run RingtoneMangerTest tests on devices without audio output.
c6fb89c2b17b31316dc1c842951a2b421aba3650 17-Nov-2014 Jason Parks <jparks@google.com> am f9e09d47: Don’t run Ringtone test if the devices without audio output.

* commit 'f9e09d47fe391b35e032ba150e4cb1c177f491b9':
Don’t run Ringtone test if the devices without audio output.
1b16d5ced284c1341c6bf3003f39027083053e30 13-Nov-2014 Jason Parks <jparks@google.com> Don’t run RingtoneMangerTest tests on devices without audio output.

Bug: 18256010
Change-Id: I8b6c4cbb487766b7787b495b568567f39c582845
rc/android/media/cts/RingtoneManagerTest.java
f9e09d47fe391b35e032ba150e4cb1c177f491b9 13-Nov-2014 Jason Parks <jparks@google.com> Don’t run Ringtone test if the devices without audio output.

Bug: 18256010
Change-Id: Ib41106f7b2d370095a182fd30ad3e7aaf4537e78
rc/android/media/cts/RingtoneTest.java
419d78beecaed046ba33218300818857d456040a 13-Nov-2014 Ricardo Garcia <rago@google.com> am 7dbf3093: CTS Visualizer effect test for long (offloaded) files

* commit '7dbf3093fbc41f2a7b9d77a83c1c5fff91d13a1c':
CTS Visualizer effect test for long (offloaded) files
7dbf3093fbc41f2a7b9d77a83c1c5fff91d13a1c 11-Nov-2014 Ricardo Garcia <rago@google.com> CTS Visualizer effect test for long (offloaded) files

Added long mp3 asset and CTS test that uses visualizer for measuring
peak and rms power. Long asset will be offloaded in supported devices.

bug: 10967161

Change-Id: I3f1f8fb3c4cbca638dfdcaa80e141e8d400ee07d
es/raw/sine1khzs40dblong.mp3
rc/android/media/cts/VisualizerTest.java
aec31bc62cbf4b0aa377bc0cb7970b3ebcbcceba 12-Nov-2014 Jason Parks <jparks@google.com> am 0bd09f25: Don’t require the codec for devices without audio output.
automerge: b38a980

* commit 'b38a980b5861b7ed81a7ae59a232425e9b9e323e':
Don’t require the codec for devices without audio output.
91ed6d4495abeef429b009ee3a0bd7bfe7afd38c 12-Nov-2014 Jason Parks <jparks@google.com> am 10a6cebf: Fix MediaCodec tests on devices without codecs.
automerge: 210cfe7

* commit '210cfe7ea284c80da1e5c72d1d4ba67adb5dd506':
Fix MediaCodec tests on devices without codecs.
b38a980b5861b7ed81a7ae59a232425e9b9e323e 12-Nov-2014 Jason Parks <jparks@google.com> am 0bd09f25: Don’t require the codec for devices without audio output.

* commit '0bd09f2560a3050311e773294c61f84cfc929952':
Don’t require the codec for devices without audio output.
210cfe7ea284c80da1e5c72d1d4ba67adb5dd506 12-Nov-2014 Jason Parks <jparks@google.com> am 10a6cebf: Fix MediaCodec tests on devices without codecs.

* commit '10a6cebfb8bc28c747460d80be852f509373cb59':
Fix MediaCodec tests on devices without codecs.
0bd09f2560a3050311e773294c61f84cfc929952 10-Nov-2014 Jason Parks <jparks@google.com> Don’t require the codec for devices without audio output.

Bug: 18236619
Change-Id: I992e8720043dbf6eff5d99a2530bdd1dce1be492
rc/android/media/cts/MediaCodecCapabilitiesTest.java
10a6cebfb8bc28c747460d80be852f509373cb59 11-Nov-2014 Jason Parks <jparks@google.com> Fix MediaCodec tests on devices without codecs.

Bug: 18236619
Change-Id: Iefd0f40684deb44dfa9d9d9a042644c4ea96cfeb
rc/android/media/cts/MediaCodecTest.java
8da4bb97d0b16cdd1f44acd6b6af47569142e2f8 12-Nov-2014 Jason Parks <jparks@google.com> am f2340113: am 62563bc4: Only run the test if the device has audio output.

* commit 'f23401130201f8794448c3c907ff02f486e36164':
Only run the test if the device has audio output.
f23401130201f8794448c3c907ff02f486e36164 12-Nov-2014 Jason Parks <jparks@google.com> am 62563bc4: Only run the test if the device has audio output.

* commit '62563bc49472a41517fe082616bfe14628b9649b':
Only run the test if the device has audio output.
5235e7c659e9ed2ba1de779459f8366445500aa1 12-Nov-2014 Jason Parks <jparks@google.com> am b1129f19: am fab65cd6: Don\'t run the test if the codec isn\'t installed.

* commit 'b1129f192656c88dfd2ba7aa187c386998f1ed15':
Don't run the test if the codec isn't installed.
b1129f192656c88dfd2ba7aa187c386998f1ed15 12-Nov-2014 Jason Parks <jparks@google.com> am fab65cd6: Don\'t run the test if the codec isn\'t installed.

* commit 'fab65cd60b3d3275a95718ac7eb4d91bf45fa000':
Don't run the test if the codec isn't installed.
62563bc49472a41517fe082616bfe14628b9649b 07-Nov-2014 Jason Parks <jparks@google.com> Only run the test if the device has audio output.

Bug: 18256010
Change-Id: I41432c272bda79e74d58d3a86bfa0334a4a7451a
rc/android/media/cts/AudioTrackTest.java
fab65cd60b3d3275a95718ac7eb4d91bf45fa000 10-Nov-2014 Jason Parks <jparks@google.com> Don't run the test if the codec isn't installed.

Bug: 18256010
Change-Id: Ieb67c972c46fce911d8bb55a8cf2922e62c21dc6
rc/android/media/cts/DecoderTest.java
d726f01de72535eedd9cf969ec109611124c978f 11-Nov-2014 Jason Parks <jparks@google.com> am f6ad3a23: Only run the test if the device has audio output.
automerge: f9b3540

* commit 'f9b35405cbb8d0ee9b38b851dd499a744235bcbe':
Only run the test if the device has audio output.
f9b35405cbb8d0ee9b38b851dd499a744235bcbe 11-Nov-2014 Jason Parks <jparks@google.com> am f6ad3a23: Only run the test if the device has audio output.

* commit 'f6ad3a2388ff7e925a6c6a9ae0294817e6b5deda':
Only run the test if the device has audio output.
f6ad3a2388ff7e925a6c6a9ae0294817e6b5deda 07-Nov-2014 Jason Parks <jparks@google.com> Only run the test if the device has audio output.

Bug: 18256010
Change-Id: I3d83b1b1f191a8d7014f3f3a431e79f4a10f06ca
rc/android/media/cts/ClearKeySystemTest.java
18b17108a7fd15ba1734d9d6f63b5e6629f6fe6e 07-Nov-2014 Jason Parks <jparks@google.com> am a7a776a0: am 6c42b2c7: Merge "Don’t run video tests on devices that do not have audio output." into lmp-sprout-dev

* commit 'a7a776a096768b9712f59c966510cdd14019b014':
Don’t run video tests on devices that do not have audio output.
a7a776a096768b9712f59c966510cdd14019b014 07-Nov-2014 Jason Parks <jparks@google.com> am 6c42b2c7: Merge "Don’t run video tests on devices that do not have audio output." into lmp-sprout-dev

* commit '6c42b2c7033f6fe3b264b37be61f52177e7fe814':
Don’t run video tests on devices that do not have audio output.
3ff03ff11743613c0c4ece2c2c630b43750c9023 05-Nov-2014 Jason Parks <jparks@google.com> Don’t run video tests on devices that do not have audio output.

Bug: 18256010
Change-Id: Id96b8cd9999e83ae9645fc0be9062facdb546b0c
rc/android/media/cts/AdaptivePlaybackTest.java
271f2aa59e7c2967faa7ebc3ca418c00f6c3aabf 31-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> am 4488f7b4: Merge "LoudnessEnhancer basic test" into lmp-mr1-dev

* commit '4488f7b49bed5839355b7a9e819f4412aa61ced1':
LoudnessEnhancer basic test
0cd48c55390c3463bd6e3c729337460707acfe09 27-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> LoudnessEnhancer basic test

Effect is supposed to be present if audio output feature
is available

Bug 18074075

Change-Id: I7306a1b19eaa2ed86bf710dec6d33528fad01479
rc/android/media/cts/LoudnessEnhancerTest.java
1ef708cb4b1d174241b4690efae14b8447e5816f 24-Oct-2014 keunyoung <keunyoung@google.com> am 35aaebdd: am e350522c: Merge "increase wait timeout and reduce dequeue buffer time-out" into lmp-dev
automerge: 592a3c4

* commit '592a3c4a925ae739630bc03b4dd128e3c7749e12':
increase wait timeout and reduce dequeue buffer time-out
592a3c4a925ae739630bc03b4dd128e3c7749e12 24-Oct-2014 keunyoung <keunyoung@google.com> am 35aaebdd: am e350522c: Merge "increase wait timeout and reduce dequeue buffer time-out" into lmp-dev

* commit '35aaebdd97b53320a060d9b419bd3495e1d83803':
increase wait timeout and reduce dequeue buffer time-out
e350522c5c44c411d5a69a956c2ce76b97b2e52d 24-Oct-2014 keunyoung <keunyoung@google.com> Merge "increase wait timeout and reduce dequeue buffer time-out" into lmp-dev
cfb4a094d4b217abfc39b86f75ef8315d8f0b805 24-Oct-2014 keunyoung <keunyoung@google.com> increase wait timeout and reduce dequeue buffer time-out

- in some devices, decoder is so slow that it is not giving output withint given time.
- increase time-out for now.
- This latency will be addressed in later release

bug: 18094786
bug: 18084984

Change-Id: I54ed512024485d938465cb0cff76c00b9e345add
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
f54017106e29750edd6c4af75b33061caa352204 24-Oct-2014 Marco Nelissen <marcone@google.com> am 0f42d54f: am 3b63f297: am 75dadf36: Merge "Use correct printf format specifier" into lmp-dev

* commit '0f42d54fe2fee71b096b1f7c90bc86a5aa72c524':
Use correct printf format specifier
0f42d54fe2fee71b096b1f7c90bc86a5aa72c524 23-Oct-2014 Marco Nelissen <marcone@google.com> am 3b63f297: am 75dadf36: Merge "Use correct printf format specifier" into lmp-dev

* commit '3b63f297269aae994bdf8e5f2621fab892f581c0':
Use correct printf format specifier
75dadf3656c37358c1e716c09268b329de7aa86e 23-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Use correct printf format specifier" into lmp-dev
976b640ec9b70338b129d76aca5a5318b5c8cbb6 23-Oct-2014 Marco Nelissen <marcone@google.com> Use correct printf format specifier

Bug: 18094443
Change-Id: Icfbed9ef95649321a051863b8754ce1229e3d890
ibmediandkjni/native-media-jni.cpp
3127febd7921f6257b0d097d98236de61f3f4049 23-Oct-2014 Eric Laurent <elaurent@google.com> am 8f37409e: am 90c66505: am ab4d7190: Merge "skip audio effect tests when not applicable" into lmp-dev

* commit '8f37409eaa95032c58451593611254227a045fd8':
skip audio effect tests when not applicable
bf4144dbc28c58dd115bfe36fd0e967dbd86ad95 23-Oct-2014 Lajos Molnar <lajos@google.com> am 3411fc3c: am 8266a5d4: am 04821b1f: media: update MediaCodecList test to use new API

* commit '3411fc3c30bf75c8528072565c9afb0d80438e35':
media: update MediaCodecList test to use new API
8f37409eaa95032c58451593611254227a045fd8 23-Oct-2014 Eric Laurent <elaurent@google.com> am 90c66505: am ab4d7190: Merge "skip audio effect tests when not applicable" into lmp-dev

* commit '90c6650584c66016865f9e88e4e8f11b25ba958a':
skip audio effect tests when not applicable
ab4d71906a8077244be73d2e8aa0db1b91067737 23-Oct-2014 Eric Laurent <elaurent@google.com> Merge "skip audio effect tests when not applicable" into lmp-dev
49a11da037dd2b7aa283b48039a1da1c82c260a1 22-Oct-2014 Eric Laurent <elaurent@google.com> skip audio effect tests when not applicable

Only Equalizer and Visualizer audio effects are mandated.
Skip the test when the platform does not support audio output
or when an effect is not reported as being implemented.

Bug: 18085894.
Bug: 15338282.
Change-Id: I2ca3af69737a5d1ae76e9505998c485ff57f9c96
rc/android/media/cts/AudioEffectTest.java
rc/android/media/cts/BassBoostTest.java
rc/android/media/cts/EnvReverbTest.java
rc/android/media/cts/EqualizerTest.java
rc/android/media/cts/PostProcTestBase.java
rc/android/media/cts/PresetReverbTest.java
rc/android/media/cts/VirtualizerTest.java
rc/android/media/cts/VisualizerTest.java
3411fc3c30bf75c8528072565c9afb0d80438e35 23-Oct-2014 Lajos Molnar <lajos@google.com> am 8266a5d4: am 04821b1f: media: update MediaCodecList test to use new API

* commit '8266a5d4ae7f0a7fb957d65a51ad41317e82b71d':
media: update MediaCodecList test to use new API
04821b1f46898093343016e81878c2b205ff34df 22-Oct-2014 Lajos Molnar <lajos@google.com> media: update MediaCodecList test to use new API

Bug: 15141324
Change-Id: I66fc118ed396ca5920a0fc7df9c0bf11e61a9e67
rc/android/media/cts/MediaCodecListTest.java
4751c121bcf45457c1de8a9fb2764a62f8299c0a 22-Oct-2014 Marco Nelissen <marcone@google.com> am ecaeb794: am 8b7991a1: am bc4f1bd4: Merge "Clean up visualizer in case of failure" into lmp-dev

* commit 'ecaeb7946de08c5e781d3b1e6fe2fe59fb34f905':
Clean up visualizer in case of failure
e4f57d7c94c240c79ee7d7b023d92999b34ff16e 22-Oct-2014 Andy Hung <hunga@google.com> am 6efbe173: am 1a7e7918: am 30ac46ec: Merge "MediaCodecTest: don\'t assume encoder can use input buffers" into lmp-dev

* commit '6efbe17312b4066c053d725a43075e2cd4da0b08':
MediaCodecTest: don't assume encoder can use input buffers
ecaeb7946de08c5e781d3b1e6fe2fe59fb34f905 22-Oct-2014 Marco Nelissen <marcone@google.com> am 8b7991a1: am bc4f1bd4: Merge "Clean up visualizer in case of failure" into lmp-dev

* commit '8b7991a1378fa5984f4936188009e7fc8d166606':
Clean up visualizer in case of failure
6efbe17312b4066c053d725a43075e2cd4da0b08 22-Oct-2014 Andy Hung <hunga@google.com> am 1a7e7918: am 30ac46ec: Merge "MediaCodecTest: don\'t assume encoder can use input buffers" into lmp-dev

* commit '1a7e79188b1687bd922884fbd1e1d5ba454b8320':
MediaCodecTest: don't assume encoder can use input buffers
bc4f1bd4fc06e1fd220f222925a5a72162e40a4b 22-Oct-2014 Marco Nelissen <marcone@google.com> Merge "Clean up visualizer in case of failure" into lmp-dev
30ac46ec488e889644049bc9bd4fc7167fcb35c2 22-Oct-2014 Andy Hung <hunga@google.com> Merge "MediaCodecTest: don't assume encoder can use input buffers" into lmp-dev
b31e02535a5bd3830eb8f86d8e6b3918656c6ae2 21-Oct-2014 Matt Gumbel <matthew.k.gumbel@intel.com> MediaCodecTest: don't assume encoder can use input buffers

The test uses createInputSurface() instead of input buffers. According to
the documentation of createInputSurface, it "Requests a Surface to use
as the input to an encoder, _in place of input buffers_." Therefore,
I think it's incorrect to assume that the encoder can hold
num_input_buffers+num_output_buffers. It can only be assumed to hold
num_output_buffers.

This resolves a potential deadlock when calling swapBuffers().

Bug: 17634422
Change-Id: I0fa83c1bf51bcb78c463bdb48b43dec338feb315
Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>
rc/android/media/cts/MediaCodecTest.java
3c495887cbe690bfa9f3b395558908d1cb35df95 21-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> am 10e2f4b2: am a0a3f3f6: am 208e9088: Merge "Run Virtualizer test only when effect is available" into lmp-dev

* commit '10e2f4b23777babac720f3967c99c21fc89c1ee0':
Run Virtualizer test only when effect is available
10e2f4b23777babac720f3967c99c21fc89c1ee0 21-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> am a0a3f3f6: am 208e9088: Merge "Run Virtualizer test only when effect is available" into lmp-dev

* commit 'a0a3f3f6cb7ee92144e31796001788f32efa5512':
Run Virtualizer test only when effect is available
3c6b86f073b8df77e6c8ee1fc718993b11dee904 21-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> am 208e9088: Merge "Run Virtualizer test only when effect is available" into lmp-dev

* commit '208e9088a95bddd77b82a043182a48166de542d0':
Run Virtualizer test only when effect is available
36a6069735d9f4c5bc9332e32b69a85625761f35 21-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> Run Virtualizer test only when effect is available

Check whether the Virtualizer effect type is available
before attempting to run any test.

Bug 17496497

Change-Id: Ifbbfbb1f92421a14f35ed0eb1250489a58cc9e3e
rc/android/media/cts/VirtualizerTest.java
18f9d1441c70ab88fed1f6b5f62fa3cc495b6a14 20-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> am 1ce64e87: Merge "Visualizer measurement tests" into lmp-mr1-dev

* commit '1ce64e87216e520bbb03165141c512118862ee5e':
Visualizer measurement tests
1ce64e87216e520bbb03165141c512118862ee5e 20-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> Merge "Visualizer measurement tests" into lmp-mr1-dev
df3e5697915958f78c1cf517b5fe14e9cccb0207 18-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> am 9104d129: am 1b71a1a8: am 0ed9706d: Merge "AudioPreProcessingTest only run with FEATURE_MICROPHONE" into lmp-dev

* commit '9104d12963956cf709b1c93df499623c1fd5c983':
AudioPreProcessingTest only run with FEATURE_MICROPHONE
16d26a521645b458bce58a1126eb4ed5bcda2503 18-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> am 0ed9706d: Merge "AudioPreProcessingTest only run with FEATURE_MICROPHONE" into lmp-dev

* commit '0ed9706df9f220fcd6225fde683891241f132878':
AudioPreProcessingTest only run with FEATURE_MICROPHONE
8cce75c9b783fd72dec5238e19351896cc37466a 17-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> Visualizer measurement tests

Test measurement mode
Test results of measurements when playing a known signal

Change-Id: I4b1a96b7fdcbf09d24d3e8cd4f0daccb852dd50b
es/raw/sine1khzm40db.wav
rc/android/media/cts/VisualizerTest.java
7e8e2bddfde25f479fdff76f4f2111550039cf3f 18-Oct-2014 Jean-Michel Trivi <jmtrivi@google.com> AudioPreProcessingTest only run with FEATURE_MICROPHONE

Bug 17497945

Change-Id: I8db63c65fc6b8bb49dbdf5817fd3378c724bb12f
rc/android/media/cts/AudioPreProcessingTest.java
41dfe88ddf8c3be995efeaadf90c19e89d49db58 15-Oct-2014 Lajos Molnar <lajos@google.com> am e9eaa2d5: am b5e4dc4c: am 834127ed: media: VP8 encoder test color format must now be the same for SW and HW

* commit 'e9eaa2d523030f397aaebff221f7451a73d9f806':
media: VP8 encoder test color format must now be the same for SW and HW
a1600dce8b7e3961d7b4a1d676144584e988e20b 14-Oct-2014 Lajos Molnar <lajos@google.com> am 834127ed: media: VP8 encoder test color format must now be the same for SW and HW

* commit '834127eda060acf102d8c7d288942944625273ce':
media: VP8 encoder test color format must now be the same for SW and HW
834127eda060acf102d8c7d288942944625273ce 14-Oct-2014 Lajos Molnar <lajos@google.com> media: VP8 encoder test color format must now be the same for SW and HW

Bug: 17935149
Change-Id: I3f33e8ac4f38eb1835bf7b993c0509f0b4735f01
rc/android/media/cts/Vp8CodecTestBase.java
8e9deb77f0fdff6bb8878bb7b41d93dda803e6d2 10-Oct-2014 Unsuk Jung <unsuk@google.com> am 3841975e: am 831e438b: Merge "Build CTS tests as multilib apks" into lmp-dev

* commit '3841975e258b5eabd8fbdb5e0ecda5648f392d7f':
Build CTS tests as multilib apks
61c690dbd8fd2794afb9bfe6709739ba4cc7347f 09-Oct-2014 Unsuk Jung <unsuk@google.com> am 831e438b: Merge "Build CTS tests as multilib apks" into lmp-dev

* commit '831e438ba317402e19415f157cbe7d9c93c4f9ad':
Build CTS tests as multilib apks
2a3bf4381997d1d9ff3b2b18a5f506756cdf9cb3 09-Oct-2014 Unsuk Jung <unsuk@google.com> Build CTS tests as multilib apks

CTS-tradefed uses the same apk for both 32 and 64 bit tests.

Bug: 17924614
Change-Id: Idbf2d93c54efbb1c281ad9e93f0f39430614df61
ndroid.mk
b26d1aca31784d6bfbf34917465fe0de3b82afaa 08-Oct-2014 Ronghua Wu <ronghuawu@google.com> am b391b1e7: am 1f18ee41: Merge "cts: fix testSwAVCDecode360pForFlexibleYuv." into lmp-dev

* commit 'b391b1e739bf7e9739cb57ba8440ffdcb7c49289':
cts: fix testSwAVCDecode360pForFlexibleYuv.
f53c3bc0b9fe6668cde8db9ef7db9c0d9d4102d0 08-Oct-2014 Ronghua Wu <ronghuawu@google.com> am 1f18ee41: Merge "cts: fix testSwAVCDecode360pForFlexibleYuv." into lmp-dev

* commit '1f18ee411fe14ccb0732c4169ac3e1fb2b1cd010':
cts: fix testSwAVCDecode360pForFlexibleYuv.
1f18ee411fe14ccb0732c4169ac3e1fb2b1cd010 08-Oct-2014 Ronghua Wu <ronghuawu@google.com> Merge "cts: fix testSwAVCDecode360pForFlexibleYuv." into lmp-dev
7defa712d3a9f54a52dece5ef7094f35f681e97e 06-Oct-2014 Ronghua Wu <ronghuawu@google.com> cts: fix testSwAVCDecode360pForFlexibleYuv.

Bug: 17144778
Change-Id: Ibf52b4979739a1d3569b4ab5c5ad9c68005acd89
rc/android/media/cts/ImageReaderDecoderTest.java
6496f619c782a5372ded5e54a079c5db03e87e3b 07-Oct-2014 Chenjie Luo <cjluo@google.com> am 4fdc118a: Merge "Move Common files from CtsTestStubs to ctsdeviceutil" into lmp-dev

* commit '4fdc118abaece282b1d6da5153c99758d85622e6':
Move Common files from CtsTestStubs to ctsdeviceutil
5dbaf66e0a6174ac0a3b9a10449de9dc97334904 07-Oct-2014 Chenjie Luo <cjluo@google.com> am 4fdc118a: Merge "Move Common files from CtsTestStubs to ctsdeviceutil" into lmp-dev

* commit '4fdc118abaece282b1d6da5153c99758d85622e6':
Move Common files from CtsTestStubs to ctsdeviceutil
4fdc118abaece282b1d6da5153c99758d85622e6 07-Oct-2014 Chenjie Luo <cjluo@google.com> Merge "Move Common files from CtsTestStubs to ctsdeviceutil" into lmp-dev
d121037eb4a9f551d968f81180675b0c168ca71b 07-Oct-2014 Andy Hung <hunga@google.com> am 01c62720: Merge "Add write mode to AudioTrackTest.testPlayStreamByteBuffer" into lmp-dev

* commit '01c62720e07589e50d17fbc3b3c927fb227ef69c':
Add write mode to AudioTrackTest.testPlayStreamByteBuffer
4ee47fd536d2fc4245dc9eb48c2d3f04565fe8d3 07-Oct-2014 Andy Hung <hunga@google.com> am 01c62720: Merge "Add write mode to AudioTrackTest.testPlayStreamByteBuffer" into lmp-dev

* commit '01c62720e07589e50d17fbc3b3c927fb227ef69c':
Add write mode to AudioTrackTest.testPlayStreamByteBuffer
d82745ff4a8b174f7be1258fd329dedc52ce58bb 26-Sep-2014 Chenjie Luo <cjluo@google.com> Move Common files from CtsTestStubs to ctsdeviceutil

bug: 17211776
Change-Id: I8dfe89d4d4f7dfcd173c264ccd32edc525674190
rc/android/media/cts/AudioManagerStub.java
rc/android/media/cts/MediaScannerConnectionTest.java
rc/android/media/cts/MediaScannerTest.java
28f648a36f328f5adff3cbe12ec4cb7e90269dd9 06-Oct-2014 Andy Hung <hunga@google.com> Add write mode to AudioTrackTest.testPlayStreamByteBuffer

Bug: 7919023
Change-Id: Ib2805d220ad0a34205fbae01d1442afe821ac6b5
rc/android/media/cts/AudioTrackTest.java
c2119c1019168c6dae4f0ebd7afe07da40676ed8 06-Oct-2014 Marco Nelissen <marcone@google.com> Clean up visualizer in case of failure

so that the actual cause of the error can be reported.
Bug: 17781474

Change-Id: I95e45d3c6b2b21c9859e4542d17883dd52e55aae
rc/android/media/cts/MediaPlayerTest.java
7176d8a3b8baea7c5067037eb6444b66fb1489bf 01-Oct-2014 Nicholas Sauer <nicksauer@google.com> am 313aaa40: Merge "Fix android.media.cts.AudioTrack_ListenerTest" into lmp-dev

* commit '313aaa4097faa828116898c8a3aa184ffccad9f7':
Fix android.media.cts.AudioTrack_ListenerTest
6287ac7e1da273ec3c2486c188fa8c0ac110a249 01-Oct-2014 Nicholas Sauer <nicksauer@google.com> am 2b34a06f: Merge "Fix MediaSessionManagerTest." into lmp-dev

* commit '2b34a06f0ee6f0acdbf9b91a66909e2d9d1401b4':
Fix MediaSessionManagerTest.
6e9f1fed7117dc0a00fc0fbf558d516148599b2f 01-Oct-2014 Rakesh Iyer <rni@google.com> am f575232b: Merge "Fail virtual display encoding tests when the codec is not supported." into lmp-dev

* commit 'f575232bf531f6b26cbfff3174087224fb69f37a':
Fail virtual display encoding tests when the codec is not supported.
178999dba539850ac8e19f77162f2dd85ef8075d 29-Sep-2014 Nicholas Sauer <nicksauer@google.com> am 313aaa40: Merge "Fix android.media.cts.AudioTrack_ListenerTest" into lmp-dev

* commit '313aaa4097faa828116898c8a3aa184ffccad9f7':
Fix android.media.cts.AudioTrack_ListenerTest
313aaa4097faa828116898c8a3aa184ffccad9f7 29-Sep-2014 Nicholas Sauer <nicksauer@google.com> Merge "Fix android.media.cts.AudioTrack_ListenerTest" into lmp-dev
38f200ffb68259ba938ca85fca08a0e2b80ec8b0 29-Sep-2014 Nicholas Sauer <nicksauer@google.com> Fix android.media.cts.AudioTrack_ListenerTest

Broken on account of the changed behavior of AndroidJUnitRunner.java
no longer calling Looper.prepare.

see ag/547306

bug:17671409
Change-Id: Iae3c226f6f8a1b234c073322fcbd28b4607e7b75
rc/android/media/cts/AudioTrack_ListenerTest.java
52cd1840070899cb01a576ee0bf232a8fb0fa0e2 29-Sep-2014 Nicholas Sauer <nicksauer@google.com> am 2b34a06f: Merge "Fix MediaSessionManagerTest." into lmp-dev

* commit '2b34a06f0ee6f0acdbf9b91a66909e2d9d1401b4':
Fix MediaSessionManagerTest.
b1557e44da4f43dfce30d239de5a2c2ecc4250b1 29-Sep-2014 Nicholas Sauer <nicksauer@google.com> Fix MediaSessionManagerTest.

Broken on account of the changed behavior of AndroidJUnitRunner.java
no longer calling Looper.prepare.

see ag/547306

bug: 17674374
Change-Id: I8f76e2447b7646b2171c7037cb48438eb2c7a107
rc/android/media/cts/MediaSessionManagerTest.java
e9db75077ae8a15ea2244f1a2f8d8ef29c07d764 29-Sep-2014 Rakesh Iyer <rni@google.com> am f575232b: Merge "Fail virtual display encoding tests when the codec is not supported." into lmp-dev

* commit 'f575232bf531f6b26cbfff3174087224fb69f37a':
Fail virtual display encoding tests when the codec is not supported.
f575232bf531f6b26cbfff3174087224fb69f37a 29-Sep-2014 Rakesh Iyer <rni@google.com> Merge "Fail virtual display encoding tests when the codec is not supported." into lmp-dev
e5e54dc4dffa2e6a2db719d4afac7969630f8455 28-Sep-2014 Rakesh Iyer <rni@google.com> Fail virtual display encoding tests when the codec is not supported.

All devices must support encoding a virtual display at least at
800x480. The tests used to exit and incorrectly mark the status
as passed before, make it so that they fail.

Bug: 17554358
Change-Id: If1968223ff4d536ae950204960b56925218d3b4f
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
f46bd108cfdd2bafe7f0325c3989a95809bda99f 27-Sep-2014 Andy Hung <hunga@google.com> am 6e4bfef1: Merge "Fix JetPlayerTest Handler Looper" into lmp-dev

* commit '6e4bfef1417df4ed5e12fbb7d9d33b8a9d1a7f31':
Fix JetPlayerTest Handler Looper
59e18bfa26c56da65d45a1199ef5a4dbae66d16d 27-Sep-2014 Andy Hung <hunga@google.com> am 6e4bfef1: Merge "Fix JetPlayerTest Handler Looper" into lmp-dev

* commit '6e4bfef1417df4ed5e12fbb7d9d33b8a9d1a7f31':
Fix JetPlayerTest Handler Looper
6e4bfef1417df4ed5e12fbb7d9d33b8a9d1a7f31 27-Sep-2014 Andy Hung <hunga@google.com> Merge "Fix JetPlayerTest Handler Looper" into lmp-dev
5752e3379ac28fec2affb3458b1c2266f201cd8a 27-Sep-2014 Andy Hung <hunga@google.com> Fix JetPlayerTest Handler Looper

Bug: 17203728
Change-Id: Ibee0847e22b2bea9a37a113ac0ca58aed3274438
rc/android/media/cts/JetPlayerTest.java
068c1e649e42f0c8d888af0a6a2cf1c0a005045c 26-Sep-2014 RoboErik <epastern@google.com> am 27563002: Merge "Add tests for setQueue and setQueueTitle in MediaSession" into lmp-dev

* commit '275630025d2c684b6b9aedffa639e034024a17fb':
Add tests for setQueue and setQueueTitle in MediaSession
0adb564c8cb77a768e761572755d5485955c3166 26-Sep-2014 Ricardo Garcia <rago@google.com> am 76d8e4de: Merge "Removing AudioEffectTest: ConstructorFromUuid()" into lmp-dev

* commit '76d8e4dee264e0e0c5da0f41d6a1ecdb9af175b5':
Removing AudioEffectTest: ConstructorFromUuid()
06eb790053285404f53638a587f2375c211c2aad 26-Sep-2014 Chong Zhang <chz@google.com> am d26c91d4: use getOutputImage() to get image plane info

* commit 'd26c91d4cef23d71d49abc745469ae97f45c53de':
use getOutputImage() to get image plane info
dcf8ba2cf1ec119b0266f938297faed3cda6c387 26-Sep-2014 RoboErik <epastern@google.com> am 27563002: Merge "Add tests for setQueue and setQueueTitle in MediaSession" into lmp-dev

* commit '275630025d2c684b6b9aedffa639e034024a17fb':
Add tests for setQueue and setQueueTitle in MediaSession
de856f0225302c6c60f9fa4ea9813e261e25fd91 24-Sep-2014 RoboErik <epastern@google.com> Add tests for setQueue and setQueueTitle in MediaSession

We were assuming these weren't null in code when they can be. This adds
a test for it to make sure they can be set to null.

bug:17593962
Change-Id: I4d1bc8cdf7c3284430e93755e878ca759fb363c1
rc/android/media/cts/MediaSessionTest.java
1d57937adadd7f3d22cd94211082b6dc8adbdfec 25-Sep-2014 Ricardo Garcia <rago@google.com> am 76d8e4de: Merge "Removing AudioEffectTest: ConstructorFromUuid()" into lmp-dev

* commit '76d8e4dee264e0e0c5da0f41d6a1ecdb9af175b5':
Removing AudioEffectTest: ConstructorFromUuid()
76d8e4dee264e0e0c5da0f41d6a1ecdb9af175b5 25-Sep-2014 Ricardo Garcia <rago@google.com> Merge "Removing AudioEffectTest: ConstructorFromUuid()" into lmp-dev
2fb287386c6bf672695e06577c3b8aec2c894230 25-Sep-2014 Chong Zhang <chz@google.com> am d26c91d4: use getOutputImage() to get image plane info

* commit 'd26c91d4cef23d71d49abc745469ae97f45c53de':
use getOutputImage() to get image plane info
d26c91d4cef23d71d49abc745469ae97f45c53de 24-Sep-2014 Chong Zhang <chz@google.com> use getOutputImage() to get image plane info

Bug: 13433554

Change-Id: I7a07c13c3eb88f3fec3db32c07f557aebbda6a98
rc/android/media/cts/DecoderTest.java
f797404407641c7105c863b7cb75cc93e5e6cb88 25-Sep-2014 Ricardo Garcia <rago@google.com> Removing AudioEffectTest: ConstructorFromUuid()

This test failed in devices that offloaded any of their effects, and
used hidden apis. Removed from test file and noted in knownfailures.txt

bug: 17605875
Change-Id: Idb464c56c4f32719d8800d63fef6ba97f11668f2
rc/android/media/cts/AudioEffectTest.java
b7d6078d1e0ec0781eda33a3c0db30732e9cf1b0 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 874f84b2: Merge "cts: select codec based on test input resolution for encoder tests." into lmp-dev

* commit '874f84b237e864aa93469428a1a3367371039116':
cts: select codec based on test input resolution for encoder tests.
8bcd8a60227547c8528af976e82d19971056f52c 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 874f84b2: Merge "cts: select codec based on test input resolution for encoder tests." into lmp-dev

* commit '874f84b237e864aa93469428a1a3367371039116':
cts: select codec based on test input resolution for encoder tests.
874f84b237e864aa93469428a1a3367371039116 25-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "cts: select codec based on test input resolution for encoder tests." into lmp-dev
7a737c623489fee94f9de3c9c71e3877f8c113a4 19-Sep-2014 Ronghua Wu <ronghuawu@google.com> cts: select codec based on test input resolution for encoder tests.

Bug: 17460057
Change-Id: I5371562441e0f649ae38b5e38cfc1bc0e7fb7f60
rc/android/media/cts/DecodeEditEncodeTest.java
f9c126e4c70f93eb15238f2ec46e6ecd01968547 24-Sep-2014 Lajos Molnar <lajos@google.com> am 8534c5d6: Merge "media: fix MediaCodecCapabilitiesTest.testAvcBaseline1 test case" into lmp-dev

* commit '8534c5d6335104072d36ef2b27a4a4c1964ef74e':
media: fix MediaCodecCapabilitiesTest.testAvcBaseline1 test case
8b6ecd811929fa7b5796b23b0ada1e3fd5f33417 24-Sep-2014 Lajos Molnar <lajos@google.com> am 8534c5d6: Merge "media: fix MediaCodecCapabilitiesTest.testAvcBaseline1 test case" into lmp-dev

* commit '8534c5d6335104072d36ef2b27a4a4c1964ef74e':
media: fix MediaCodecCapabilitiesTest.testAvcBaseline1 test case
8534c5d6335104072d36ef2b27a4a4c1964ef74e 24-Sep-2014 Lajos Molnar <lajos@google.com> Merge "media: fix MediaCodecCapabilitiesTest.testAvcBaseline1 test case" into lmp-dev
8ddcdb320ecef00598b9e3f700477b12ca8a6fba 24-Sep-2014 Nicholas Sauer <nicksauer@google.com> am 30cd2c43: Merge "Fixup failing tests in android.media." into lmp-dev

* commit '30cd2c43950b9962faea5eac039d10436c6de7b5':
Fixup failing tests in android.media.
5c3376ef8e94dd477994fbe8cd53ff268bf9dcf7 24-Sep-2014 Nicholas Sauer <nicksauer@google.com> am 30cd2c43: Merge "Fixup failing tests in android.media." into lmp-dev

* commit '30cd2c43950b9962faea5eac039d10436c6de7b5':
Fixup failing tests in android.media.
c3b464681bb5a0fb9a4c83b87a7b29e4d6a1a7a8 24-Sep-2014 Lajos Molnar <lajos@google.com> media: fix MediaCodecCapabilitiesTest.testAvcBaseline1 test case

Bug: 16869881
Change-Id: I9e1037bc31627fcbda65785d44d615696bf16d36
rc/android/media/cts/MediaCodecCapabilitiesTest.java
dc200f70b10b71e73ab073db563ee476bf3705ca 24-Sep-2014 Nicholas Sauer <nicksauer@google.com> Fixup failing tests in android.media.

Broken on account of the changed behavior of AndroidJUnitRunner.java
no longer calling Looper.prepare.

See ag/547306
bug:17512187

Change-Id: Ibd13ed3476ebcfbd83db75b32b44357f9c002528
rc/android/media/cts/MediaPlayerTest.java
f41578a533b5178ff77bcecce22c3faa866359df 22-Sep-2014 Andy Hung <hunga@google.com> am b2bae219: Merge "Fix AudioTrackTest.testGetTimestamp" into lmp-dev

* commit 'b2bae2198c74337307aca8b735ac6d5207f0da95':
Fix AudioTrackTest.testGetTimestamp
f56e529bb5a115a3bf09829bdd3b0fd807a94273 22-Sep-2014 Andy Hung <hunga@google.com> am b2bae219: Merge "Fix AudioTrackTest.testGetTimestamp" into lmp-dev

* commit 'b2bae2198c74337307aca8b735ac6d5207f0da95':
Fix AudioTrackTest.testGetTimestamp
b2bae2198c74337307aca8b735ac6d5207f0da95 22-Sep-2014 Andy Hung <hunga@google.com> Merge "Fix AudioTrackTest.testGetTimestamp" into lmp-dev
07ed4e67992278837504c31f673b0439b68a5823 19-Sep-2014 Andy Hung <hunga@google.com> Fix AudioTrackTest.testGetTimestamp

Made more stable for different HW platforms.
Added Report logging for jitter.

Bug: 17500505
Change-Id: I5d79d84eea4746b8599dbce2a3d27beaededd664
rc/android/media/cts/AudioTrackTest.java
da89e7811bf90107bfad998c8cef561f2447703c 19-Sep-2014 Alex Glaznev <glaznev@google.com> am ef9e15ae: Fix CTS VP8 decoder test for HW decoder which support yuv420 output.

* commit 'ef9e15ae3ce9b7feee107f7c91309742f5364c53':
Fix CTS VP8 decoder test for HW decoder which support yuv420 output.
f8aaff10e32855e9eb980ce02f02abe49af836d0 19-Sep-2014 Alex Glaznev <glaznev@google.com> am ef9e15ae: Fix CTS VP8 decoder test for HW decoder which support yuv420 output.

* commit 'ef9e15ae3ce9b7feee107f7c91309742f5364c53':
Fix CTS VP8 decoder test for HW decoder which support yuv420 output.
ef9e15ae3ce9b7feee107f7c91309742f5364c53 19-Sep-2014 Alex Glaznev <glaznev@google.com> Fix CTS VP8 decoder test for HW decoder which support
yuv420 output.

Bug: 16353967

When video decoder outputs yuv420 data and output frame
stride and/or slice height are greater than frame width
and height it is necessary to pack the frame before writing
it to yuv file for future PSNR calculation.

Verified CTS tests passed on N4, N5, Volantis L builds and
Galaxy S5, Xperia Z1, HTC M8 KK builds.

Change-Id: I5853068de99e0351b4127f7cc38082dbe6941dcb
rc/android/media/cts/Vp8CodecTestBase.java
07de358e46e9ba2c5ac535bf8cab495cd5e816a6 19-Sep-2014 Marco Nelissen <marcone@google.com> am 2f8d2095: Merge "Test for playback after completion and seekTo(0)" into lmp-dev

* commit '2f8d20950e0998e705cfe383ede6908cb37ae944':
Test for playback after completion and seekTo(0)
7e829c8de1324e11d943e0ae16f0beeeb24ca54c 19-Sep-2014 Marco Nelissen <marcone@google.com> am 2f8d2095: Merge "Test for playback after completion and seekTo(0)" into lmp-dev

* commit '2f8d20950e0998e705cfe383ede6908cb37ae944':
Test for playback after completion and seekTo(0)
2f8d20950e0998e705cfe383ede6908cb37ae944 19-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Test for playback after completion and seekTo(0)" into lmp-dev
724e75f7f92a7c700b8505b65136e26ea1c38e44 18-Sep-2014 Lenka Trochtova <ltrochtova@google.com> am 22d7ed48: am 6012d1ff: am f263df2e: CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.

* commit '22d7ed486e3ae5294b51ef84b11aa11d295517f0':
CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.
44a32634c59ac768530b9d737833ad418bfaa7cf 18-Sep-2014 Lenka Trochtova <ltrochtova@google.com> am 22d7ed48: am 6012d1ff: am f263df2e: CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.

* commit '22d7ed486e3ae5294b51ef84b11aa11d295517f0':
CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.
22d7ed486e3ae5294b51ef84b11aa11d295517f0 18-Sep-2014 Lenka Trochtova <ltrochtova@google.com> am 6012d1ff: am f263df2e: CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.

* commit '6012d1ff96705676601722a5b0ad87902c4497c4':
CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.
6012d1ff96705676601722a5b0ad87902c4497c4 18-Sep-2014 Lenka Trochtova <ltrochtova@google.com> am f263df2e: CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.

* commit 'f263df2e36a552a4e18a18f5beb2dfa2f5d2c91b':
CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by the codec before calling getCapabilitiesForType.
f263df2e36a552a4e18a18f5beb2dfa2f5d2c91b 18-Sep-2014 Lenka Trochtova <ltrochtova@google.com> CTS: fix MediaCodecCapabilitiesTest - check that the mime type is supported by
the codec before calling getCapabilitiesForType.

Bug: 17551614

Change-Id: I04b39eecb46771a52e3e46af98385de1c6793a21
rc/android/media/cts/MediaCodecCapabilitiesTest.java
f1ca44d451bbac76ef2e7a71f5dcb4643f7285e8 18-Sep-2014 Alex Glaznev <glaznev@google.com> am 1f7eb2e9: Fix CTS VP8 encoder video quality test for Qualcomm codec.

* commit '1f7eb2e9949351d8136a9d9e256149ffd48a656f':
Fix CTS VP8 encoder video quality test for Qualcomm codec.
f793d7e6ea8cae709655c6c10977679847359007 18-Sep-2014 Alex Glaznev <glaznev@google.com> am 1f7eb2e9: Fix CTS VP8 encoder video quality test for Qualcomm codec.

* commit '1f7eb2e9949351d8136a9d9e256149ffd48a656f':
Fix CTS VP8 encoder video quality test for Qualcomm codec.
1f7eb2e9949351d8136a9d9e256149ffd48a656f 18-Sep-2014 Alex Glaznev <glaznev@google.com> Fix CTS VP8 encoder video quality test for Qualcomm codec.

Bug: 16353967

When reading yuv data from the decoder output buffer use
actual frame width and height instead of relying on
MediaCodec.BufferInfo.size.

Change-Id: Ia3e935e9bf8fed2c39b95c8a71a3b720f6371148
rc/android/media/cts/Vp8CodecTestBase.java
0bf7440c66736c37101c9008566015d3551b0e96 17-Sep-2014 Marco Nelissen <marcone@google.com> Test for playback after completion and seekTo(0)

This test plays a file to completion, seeks back to 0, then starts
playback again, and verifies that the file is played both times.

Bug: 17521470
Change-Id: Ic2a7a4f39c67afaaae4cab6a52dcb19064fa6196
es/raw/camera_click.ogg
rc/android/media/cts/MediaPlayerTest.java
f36566fb2d154014b069d074fb4c53ef378a7c88 17-Sep-2014 Robert Shih <robertshih@google.com> am 33c3d396: Merge "MediaPlayerTest: relax test*Track time constraints" into lmp-dev

* commit '33c3d3967ce0daf1c96e1fba9c97ba9cdfdfa7ca':
MediaPlayerTest: relax test*Track time constraints
4d157790c70cbee3607d7605d60eddf49ff20fe7 17-Sep-2014 Eric Laurent <elaurent@google.com> am c31d8ac4: Merge "fix AudioManagerTest.testAccessMode()" into lmp-dev

* commit 'c31d8ac41c9c3c2c5e10ceddc0a36793b8ed6c50':
fix AudioManagerTest.testAccessMode()
5c36dced74f442446fc6b86118362282316123ad 17-Sep-2014 Robert Shih <robertshih@google.com> am 33c3d396: Merge "MediaPlayerTest: relax test*Track time constraints" into lmp-dev

* commit '33c3d3967ce0daf1c96e1fba9c97ba9cdfdfa7ca':
MediaPlayerTest: relax test*Track time constraints
adafc94c1fad66a3c216bdb4461b20fda899a7f8 16-Sep-2014 Eric Laurent <elaurent@google.com> am c31d8ac4: Merge "fix AudioManagerTest.testAccessMode()" into lmp-dev

* commit 'c31d8ac41c9c3c2c5e10ceddc0a36793b8ed6c50':
fix AudioManagerTest.testAccessMode()
973d66f7f128430a9bdf7ea1a5379269e653cfdc 16-Sep-2014 Robert Shih <robertshih@google.com> MediaPlayerTest: relax test*Track time constraints

Bug: 17512187
Change-Id: Ifa9042968bed5169d5ad3ca1a0c000d34348329e
rc/android/media/cts/MediaPlayerTest.java
b24020fe900f9f59a11f1f2f00faf7f7d1b79bc5 16-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 8b8c1149: Merge "cts: change HEVC adaptive tests to use streams with same aspect ratios." into lmp-dev

* commit '8b8c1149d5eae49980e7ab5fcf9673621ca33c21':
cts: change HEVC adaptive tests to use streams with same aspect ratios.
f8b450f9176b2d335903c544c4bb5620eab9ad54 16-Sep-2014 Ronghua Wu <ronghuawu@google.com> am df43bb92: Merge "cts: add testH263_adaptiveDrc" into lmp-dev

* commit 'df43bb926fc4ef4026aa6a60731efbd928b8f65e':
cts: add testH263_adaptiveDrc
c31d8ac41c9c3c2c5e10ceddc0a36793b8ed6c50 16-Sep-2014 Eric Laurent <elaurent@google.com> Merge "fix AudioManagerTest.testAccessMode()" into lmp-dev
33226a901b4414b9a27fa5beadf218f5d98a0d01 16-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 8b8c1149: Merge "cts: change HEVC adaptive tests to use streams with same aspect ratios." into lmp-dev

* commit '8b8c1149d5eae49980e7ab5fcf9673621ca33c21':
cts: change HEVC adaptive tests to use streams with same aspect ratios.
1c1513576b9da3ef935e0f53ed91523797c386aa 16-Sep-2014 Ronghua Wu <ronghuawu@google.com> am df43bb92: Merge "cts: add testH263_adaptiveDrc" into lmp-dev

* commit 'df43bb926fc4ef4026aa6a60731efbd928b8f65e':
cts: add testH263_adaptiveDrc
1800c246825ec73b8c481b94267581b30bf4e995 16-Sep-2014 Eric Laurent <elaurent@google.com> fix AudioManagerTest.testAccessMode()

AudioManager.setMode(MODE_IN_CALL) now requires
system permission MODIFY_PHONE_STATE.

Bug: 17457513.
Change-Id: If3a0b827edd3ca1303dc9cd532aaa7b5be2b24da
rc/android/media/cts/AudioManagerTest.java
8b8c1149d5eae49980e7ab5fcf9673621ca33c21 16-Sep-2014 Ronghua Wu <ronghuawu@google.com> Merge "cts: change HEVC adaptive tests to use streams with same aspect ratios." into lmp-dev
3fc1a4beaf77304147965fec51ab528b6290e48d 13-Sep-2014 Ronghua Wu <ronghuawu@google.com> am 5854c922: Merge "cts: add testMpeg4_adaptiveDrc" into lmp-dev

* commit '5854c922a9468eab3fad6d770f7d57b5f7ef359b':
cts: add testMpeg4_adaptiveDrc
7b0f5c10cc160d797bdf52a8e37626c054fc974e 13-Sep-2014 Ronghua Wu <ronghuawu@google.com> cts: change HEVC adaptive tests to use streams with same aspect ratios.

The new test clip, which is generated with ffmpeg + x265:
ffmpeg -i video_1280x720_mp4_hevc_1150kbps_30fps_aac_stereo_128kbps_48000hz.mp4 -codec:v libx265 -s 640x360 -b:v 450k -c:a copy video_640x360_mp4_hevc_450kbps_30fps_aac_stereo_128kbps_48000hz.mp4

Bug: 17326758
Change-Id: I48f3f3d9878a50b2c9c0984ab58f3bb79db3a97a
es/raw/video_640x360_mp4_hevc_450kbps_30fps_aac_stereo_128kbps_48000hz.mp4
rc/android/media/cts/AdaptivePlaybackTest.java
6b25b348a2a77003868c32933920778e6a84a2df 11-Sep-2014 Ronghua Wu <ronghuawu@google.com> cts: add testH263_adaptiveDrc

Also add test clip, which is generated with ffmpeg-2.3.1:
./ffmpeg -i video_1280x720_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4 -strict -2 -codec:v h263 -f 3gp -s 352x288 -r 12 -b:v 300k -codec:a aac -b:a 128k -ar 22050 video_352x288_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp

Bug: 17326758
Change-Id: I0b08a5731f741a9a9b836b0c07db98fcdd0cedde
es/raw/video_352x288_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp
rc/android/media/cts/AdaptivePlaybackTest.java
e9f9b98d08326f42c44859231df16bd710036324 08-Sep-2014 Ronghua Wu <ronghuawu@google.com> cts: add testMpeg4_adaptiveDrc

Also add test clip, which is generated with ffmpeg-2.3.1:
./ffmpeg -i video_1280x720_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4 -strict -2 -codec:v mpeg4 -b:v 1000k -b:a 128k -ar 44100 video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4

Bug: 17326758
Change-Id: I42e38ede8ce8e6d37fda7a20713ee605c40462e9
es/raw/video_1280x720_mp4_mpeg4_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/AdaptivePlaybackTest.java
b4d27fd65b683d965b5cc84991098a2c355f0149 11-Sep-2014 Marco Nelissen <marcone@google.com> am 08c0cdca: Merge "Add test for 5.1 multichannel aac" into lmp-dev

* commit '08c0cdcadadd2601e76dea8d813427feab1c93e6':
Add test for 5.1 multichannel aac
08c0cdcadadd2601e76dea8d813427feab1c93e6 11-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Add test for 5.1 multichannel aac" into lmp-dev
5780add91292cebb24824c9f349af84d1d23b71d 11-Sep-2014 Marco Nelissen <marcone@google.com> Add test for 5.1 multichannel aac

bug: 17454025
Change-Id: I962f2590b610f4bb563bca814fe5562b2ed39abd
es/raw/sinesweep51m4a.m4a
rc/android/media/cts/DecoderTest.java
c0349a6c9614ec70f3a22a590957591569ba4e69 10-Sep-2014 Chong Zhang <chz@google.com> am b6daa3d1: Merge "fix cts failure in Vp8EncoderTest#testAsyncEncoding" into lmp-dev

* commit 'b6daa3d10934ee3d640dac53c721067c7796ae44':
fix cts failure in Vp8EncoderTest#testAsyncEncoding
Fix failures in AudioTrack listener test
Add renderscript into Android.mk for android.renderscript in CTS
Fix testGetLayoutDirectionFromLocale.
Fixing timeout check.
Fix bad cts test
Fix test builder verifiers
Fix print CTS tests
Fix build.
Correctly pass force-abi to instrumental test.
Fix crashing dispatchDraw test
Fix build break cause by power tests.
b6daa3d10934ee3d640dac53c721067c7796ae44 10-Sep-2014 Chong Zhang <chz@google.com> Merge "fix cts failure in Vp8EncoderTest#testAsyncEncoding" into lmp-dev
f00fca4aeaf1220682fb795ee6f251910f8eb43b 10-Sep-2014 Alex Glaznev <glaznev@google.com> am 515f22fe: Merge "Add parallel VP8 encoding and decoding test." into lmp-dev

* commit '515f22fedd6bcba3b511e22a66896409a27eebf0':
Add parallel VP8 encoding and decoding test.
515f22fedd6bcba3b511e22a66896409a27eebf0 10-Sep-2014 Alex Glaznev <glaznev@google.com> Merge "Add parallel VP8 encoding and decoding test." into lmp-dev
04fb6c7b10628579c829298dfe13c237103e684b 10-Sep-2014 keunyoung <keunyoung@google.com> am 89d2a32f: Merge "fix test by disabling action bar from Presentation" into lmp-dev

* commit '89d2a32f3a2f450a78e8962362019fc9291121fc':
fix test by disabling action bar from Presentation
b48a9cf7c290202d04cbdad178a9ac874c714abe 10-Sep-2014 Chong Zhang <chz@google.com> fix cts failure in Vp8EncoderTest#testAsyncEncoding

do not call getInputBuffers/getOutputBuffers in async mode, use
getInputBuffer/getOutputBuffer instead

Bug: 17258251
Change-Id: I9442d12745ca07cf5f48d0c6fb88867b6e5c2a27
rc/android/media/cts/Vp8CodecTestBase.java
7c33b5b700affc7a6175104f94b086227f1abf86 10-Sep-2014 keunyoung <keunyoung@google.com> fix test by disabling action bar from Presentation

- it affected layout and prevented screen to change

bug: 17373884
Change-Id: I1086da9c76a54e6bb4e1e6b447a9412f469a06d9
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/RemoteVirtualDisplayService.java
151fa8d4ecc9dea9f91cef496ee6d7f715b5b1ea 10-Sep-2014 Robert Shih <robertshih@google.com> am 0c52cab4: Merge "MediaPlayerTest: assert track count after prepare" into lmp-dev

* commit '0c52cab4322df24ab30eccb75a3ced599431990c':
MediaPlayerTest: assert track count after prepare
ab04ff1ac4baf876ba3b5ec01732aad40916e883 10-Sep-2014 Alex Glaznev <glaznev@google.com> Add parallel VP8 encoding and decoding test.

Bug: 16353967

Add CTS test which encodes and decodes 9 seconds of raw stream
sequentially in CBR mode and then run parallel encoding and
decoding of the same streams.

Change-Id: I52d1183059dc5c222a3bc8d7ee0caca061bdc3d3
rc/android/media/cts/Vp8EncoderTest.java
12903442959a279c58fda3c853699a53bb7401cd 09-Sep-2014 Robert Shih <robertshih@google.com> MediaPlayerTest: assert track count after prepare

Bug: 16870964
Change-Id: I91acf98bf53a06c4dc438b8e3f5950c0035ecb6a
rc/android/media/cts/MediaPlayerTest.java
3410d64e86057a7a1eae0a2d9840aa8deb77af71 09-Sep-2014 Flavio Lerda <flerda@google.com> resolved conflicts for merge of 991512bf to lmp-dev-plus-aosp

Change-Id: Ic2d5fa8184f26d8c018622f5220c60414f68e99d
991512bf4e033709d59cbd30447afeb1f417e226 08-Sep-2014 Flavio Lerda <flerda@google.com> Merge "Skip encoding tests for unsupported resolutions."
6519ab3528a6cfc9915e6b58024f245e348fb6dc 07-Sep-2014 Hongyu Zhang <hongyu.zhang@intel.com> am 6c8e14ce: am 62c4de5c: am f137d44b: am c88e0af6: Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test

* commit '6c8e14ce64700333952b2723d00cd108f62b183e':
Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test
6c8e14ce64700333952b2723d00cd108f62b183e 07-Sep-2014 Hongyu Zhang <hongyu.zhang@intel.com> am 62c4de5c: am f137d44b: am c88e0af6: Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test

* commit '62c4de5c1a8b23b6cccb72280550f79d6a59bdbf':
Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test
62c4de5c1a8b23b6cccb72280550f79d6a59bdbf 07-Sep-2014 Hongyu Zhang <hongyu.zhang@intel.com> am f137d44b: am c88e0af6: Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test

* commit 'f137d44b7adf04166c961d69d509401dd60ba66d':
Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test
c88e0af687c8873b311de043d648df7f6229c80d 02-Jul-2014 Hongyu Zhang <hongyu.zhang@intel.com> Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test

MSDK OMX plugin will reconfiged the output buffers when the first encode
frame coming up. After that, Output buffers will be re-allocated and a
message MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED will be raised simultaneously,
up-layer application have to handle this message and get the new
outputbuffers, otherwise it will be wrong.

But the cts test EncodeVirtualDisplayWithCompositionTest did not handle
the message MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED cause the outputbuffers
are outdated, then crash happened when java want to read them.

Modified the test case to handle MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED as
EncoderTest.java does.

Change-Id: I32ea59a9d34880e33d374d1999990596b865f8ea
Singed-off-by: Ying Chang <ying.chang@intel.com>
Signed-off-by: Hongyu Zhang <hongyu.zhang@intel.com>
Signed-off-by: Wang LiangX <liangx.wang@intel.com>
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
5b74b971e6371dd1f4695c415e602d12706e5494 07-Sep-2014 Unsuk Jung <unsuk@google.com> am 7ddf7887: Merge "Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test"

* commit '7ddf78874d086e5bafd89ced7ffa9bfd3291ba32':
Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test
86d92647f17ca887cbaadb0bd8d367ffa7646120 02-Jul-2014 Hongyu Zhang <hongyu.zhang@intel.com> Need to handle INFO_OUTPUT_BUFFERS_CHANGED in an encode test

MSDK OMX plugin will reconfiged the output buffers when the first encode
frame coming up. After that, Output buffers will be re-allocated and a
message MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED will be raised simultaneously,
up-layer application have to handle this message and get the new
outputbuffers, otherwise it will be wrong.

But the cts test EncodeVirtualDisplayWithCompositionTest did not handle
the message MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED cause the outputbuffers
are outdated, then crash happened when java want to read them.

Modified the test case to handle MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED as
EncoderTest.java does.

Change-Id: I32ea59a9d34880e33d374d1999990596b865f8ea
Singed-off-by: Ying Chang <ying.chang@intel.com>
Signed-off-by: Hongyu Zhang <hongyu.zhang@intel.com>
Signed-off-by: Wang LiangX <liangx.wang@intel.com>
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
e0980066d95defe48bd914088649b5a5816925c1 05-Sep-2014 Glenn Kasten <gkasten@google.com> am d444ec52: Merge "Fix failures in AudioTrack listener test" into lmp-dev

* commit 'd444ec52a5b7056ae210c2910b63b8bf78573f81':
Fix failures in AudioTrack listener test
d444ec52a5b7056ae210c2910b63b8bf78573f81 05-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Fix failures in AudioTrack listener test" into lmp-dev
012476358df823a1476201536274129102d2bd41 04-Sep-2014 RoboErik <epastern@google.com> am b3a935b7: Merge "Update VolumeProvider reference to fix build" into lmp-dev

* commit 'b3a935b7df3dcc97dbb143c32181bc2c526a914c':
Update VolumeProvider reference to fix build
0e65cec3ab412d7f32d6c2f4fab958dc1217c0ce 04-Sep-2014 RoboErik <epastern@google.com> Update VolumeProvider reference to fix build

Forgot to upload a change in CTS

Change-Id: I5b2e7cf1b85655db31987fe7e51e638a56ef3e13
rc/android/media/cts/MediaSessionTest.java
7149a518b0f286ac39de769b1c255c3461dabbc7 03-Sep-2014 Glenn Kasten <gkasten@google.com> Fix failures in AudioTrack listener test

This was a long-standing failure, not a regression.
As far as I can tell, the test never worked before now.

Bug: 14640972
Change-Id: I6259d21102dde7452f7db2bfb068b1fbf46b70ea
rc/android/media/cts/AudioTrack_ListenerTest.java
6ca61238b53c6dbb70a97ca30ca952789d89edfd 25-Aug-2014 yoongeun.kwon <yoongeun.kwon@lge.com> Skip encoding tests for unsupported resolutions.

Some low-tier chipsets do not support video encoding at resolutions
above 720p (1280x720). However, some of the CTS tests attempt to encode
at these resolutions even if they are not supported, and therefore fail.

To fix this, because running the test itself, check that the video size
is supported, and skip the test if not.

To check whether the resolution is supported, for the AVC case, compare
the requested resolution with the limits specified in the AVC
specification, based on the level supported by the encoder.

Change-Id: I3ecb8d30235c8fef854551ce2b10c65ae72d86f9
Signed-off-by: Yoongeun Kwon <yoongeun.kwon@lge.com>
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
7b2457f24f7630d8b459c9062b0beb163b8cb5c1 04-Sep-2014 Marco Nelissen <marcone@google.com> am 02908147: Merge "Expand character set detector tests" into lmp-dev

* commit '029081478c232c371ecd7c00a47c8ab2005df610':
Expand character set detector tests
029081478c232c371ecd7c00a47c8ab2005df610 03-Sep-2014 Marco Nelissen <marcone@google.com> Merge "Expand character set detector tests" into lmp-dev
3eaf1a5e818893c808f4047a86d0e9a6b6ae15c4 02-Sep-2014 Marco Nelissen <marcone@google.com> Expand character set detector tests

Add more sample files, and test that MediaMetadataRetriever gives
the same result as the media scanner.

Bug: 16302581, 17205395
Change-Id: I72c3741c018381d3e79c98e7eadec0b1fd5322db
es/raw/iso88591_10.mp3
es/raw/iso88591_11.mp3
es/raw/iso88591_12.mp3
es/raw/iso88591_13.mp3
es/raw/iso88591_3.mp3
es/raw/iso88591_4.mp3
es/raw/iso88591_5.mp3
es/raw/iso88591_6.mp3
es/raw/iso88591_7.mp3
es/raw/iso88591_8.mp3
es/raw/iso88591_9.mp3
es/raw/utf16_1.mp3
rc/android/media/cts/MediaScannerTest.java
34d95e054c327d3315caa7d473a037e1199db95e 03-Sep-2014 Glenn Kasten <gkasten@google.com> am 9b6194cb: Merge "Fix regression in CTS for AudioTrack sample rates" into lmp-dev

* commit '9b6194cb06a935f3283f0ccce2e1aa48eef2320f':
Fix regression in CTS for AudioTrack sample rates
9b6194cb06a935f3283f0ccce2e1aa48eef2320f 03-Sep-2014 Glenn Kasten <gkasten@google.com> Merge "Fix regression in CTS for AudioTrack sample rates" into lmp-dev
56ec7e6513aabbcf1215d10a2eef0908b1d56e86 02-Sep-2014 RoboErik <epastern@google.com> am 3435238e: Merge "Initial set of CTS tests for MediaSession APIs" into lmp-dev

* commit '3435238eaec5082722f1833264c0edb876beb894':
Initial set of CTS tests for MediaSession APIs
ce4552f05086f4047a287dc5bc3a4f81a15b2aab 02-Sep-2014 Glenn Kasten <gkasten@google.com> Fix regression in CTS for AudioTrack sample rates

Bug: 17356985
Change-Id: I691835e317e77b299bf18531d517e1be40d85407
rc/android/media/cts/AudioTrackTest.java
3435238eaec5082722f1833264c0edb876beb894 02-Sep-2014 RoboErik <epastern@google.com> Merge "Initial set of CTS tests for MediaSession APIs" into lmp-dev
f76faf645bde42f2a6c2d93eb767fa5b7d36d131 22-Aug-2014 RoboErik <epastern@google.com> Initial set of CTS tests for MediaSession APIs

This just adds some basic tests as a start for MediaSession APIs. More
to come in later CLs.

Change-Id: I9f314c4843139b60c38fa9598669aa1c37ba709f
rc/android/media/cts/MediaSessionManagerTest.java
rc/android/media/cts/MediaSessionTest.java
dd000aa580e0acd48b0eb71c375e74a7e3b19b23 22-Aug-2014 Lajos Molnar <lajos@google.com> am 1ba59f24: Merge "Skip VP8 encode test on devices without VP8" into lmp-dev

* commit '1ba59f248ef5fe54d8b49c0a655c7f0004de1f09':
Skip VP8 encode test on devices without VP8
f2a7daa8400d1316a9dabeae507b4702d713d2c7 12-Jun-2014 Johann <johannkoenig@google.com> Skip VP8 encode test on devices without VP8

Cherrypick from in-flight CL https://googleplex-android-review.git.corp.google.com/483462

Bug: 15321261

Change-Id: I5fea9bdc56b92eed544f8960ff82e8910f9417c5
rc/android/media/cts/Vp8CodecTestBase.java
rc/android/media/cts/Vp8EncoderTest.java
ebc5de47059fd04e42f65206d4b9ea531b411fc1 18-Aug-2014 Andy Hung <hunga@google.com> am 28259178: Merge "Update AudioTrackTest to test 7.1 and 96kHz" into lmp-dev

* commit '282591780c88592161373d35f20eb0c2f51bca19':
Update AudioTrackTest to test 7.1 and 96kHz
a560619510431470a12082c07c93b59f09751d8b 16-Aug-2014 Andy Hung <hunga@google.com> Update AudioTrackTest to test 7.1 and 96kHz

Ensure full AudioTrack range is tested.

Bug: 11532760
Bug: 16951383
Bug: 17069369
Change-Id: I058a9fe09ef1bc8f90c40f05352e287d2be9e12d
rc/android/media/cts/AudioTrackTest.java
599bd3532a02e5eea8b1919a2c4d53271256f402 13-Aug-2014 Ricardo Garcia <rago@google.com> am 2eae9752: Merge "Fixing null pointer error in CTS AudioManagerTest" into lmp-dev

* commit '2eae9752b8c46bc3c726e48cdcf62844a47b2073':
Fixing null pointer error in CTS AudioManagerTest
2eae9752b8c46bc3c726e48cdcf62844a47b2073 13-Aug-2014 Ricardo Garcia <rago@google.com> Merge "Fixing null pointer error in CTS AudioManagerTest" into lmp-dev
0a54dc03bdf7204caf92ab462906b604386ed03b 12-Aug-2014 Ricardo Garcia <rago@google.com> Fixing null pointer error in CTS AudioManagerTest

Certain devices without MediaPlayer (e.g. clockwork devices) were crashing
this CTS test. Null pointer assertions added.

Bug: 15319269

Change-Id: Iad1d3528905a88e177a2558e048b28b08847e615
rc/android/media/cts/AudioManagerTest.java
c56e4625af41e9af80c28503f848cdd57057a0eb 12-Aug-2014 Andy Hung <hunga@google.com> am 15679e5c: Update CTS AudioTrackTest for multichannel

* commit '15679e5c59afd27f43ae5ad2f0a933c67f30ba2a':
Update CTS AudioTrackTest for multichannel
15679e5c59afd27f43ae5ad2f0a933c67f30ba2a 11-Aug-2014 Andy Hung <hunga@google.com> Update CTS AudioTrackTest for multichannel

Bug: 11532760
Change-Id: I9f13129672ee87f18286b5e6dc8c4786761f96e7
rc/android/media/cts/AudioTrackTest.java
e0343deebba54b0d3793880c9fb8ffa1cdc5be26 09-Aug-2014 Andy Hung <hunga@google.com> am 76b94615: Merge "Add test for MediaCodec exceptions" into lmp-dev

* commit '76b9461556f63e0bd9c2f9fdf5e0cf850681cc9c':
Add test for MediaCodec exceptions
76b9461556f63e0bd9c2f9fdf5e0cf850681cc9c 09-Aug-2014 Andy Hung <hunga@google.com> Merge "Add test for MediaCodec exceptions" into lmp-dev
789af4bb41c27b11360d36deaccb576ea595bf38 08-Aug-2014 Andy Hung <hunga@google.com> am 4594abcb: Merge "Increase sample rate checking range for AudioTracks" into lmp-dev

* commit '4594abcb098d93b95a8efb06f45f1075b1e3cdf1':
Increase sample rate checking range for AudioTracks
caef8b1271bba5d456a33821e4d4fd8cd4e377b5 07-Aug-2014 Andy Hung <hunga@google.com> Increase sample rate checking range for AudioTracks

Associated with sampling rate ratio changes.
Can modify testPlayStreamData to force playback of different sample rates.

Change-Id: Ibda8b3607e651e9a77345a899f8c4092cbb90a55
rc/android/media/cts/AudioTrackTest.java
71959717e9772f5fc3d9b6cc7a4de97fba15398b 27-Jan-2014 Andy Hung <hunga@google.com> Add test for MediaCodec exceptions

Bug: 12034929
Bug: 13976475
Bug: 15562792
Change-Id: Iceec178666d350754eb0ea0023ea1e9b3a89150b
rc/android/media/cts/MediaCodecTest.java
89671f940db9dd0c6564ff8f4288f6f2b7f0955a 04-Aug-2014 Zhijun He <zhijunhe@google.com> am f1c66459: Merge "CameraCorderProfile: update test for high speed quality levels" into lmp-dev

* commit 'f1c6645984d9337622d98be5d2858d2483199a45':
CameraCorderProfile: update test for high speed quality levels
f1c6645984d9337622d98be5d2858d2483199a45 04-Aug-2014 Zhijun He <zhijunhe@google.com> Merge "CameraCorderProfile: update test for high speed quality levels" into lmp-dev
b0edd9be05c4f974aecbc8d043eece3e3a4918a9 26-Jul-2014 Robert Shih <robertshih@google.com> am 1a02b942: Merge "MediaPlayerTest.testGetTrackInfo: fix effect-less statement" into lmp-dev

* commit '1a02b942acc2dd261bed8f11be5febf76c7e52b0':
MediaPlayerTest.testGetTrackInfo: fix effect-less statement
12e77899b0cc595032eb9b890c866d64acafef3c 24-Jul-2014 Zhijun He <zhijunhe@google.com> CameraCorderProfile: update test for high speed quality levels

Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
rc/android/media/cts/CamcorderProfileTest.java
866c5b56960e39fb040f985fc2558374bd62f139 25-Jul-2014 Robert Shih <robertshih@google.com> MediaPlayerTest.testGetTrackInfo: fix effect-less statement

Change-Id: I5e836670435077de364f3788043c96f109c798fc
rc/android/media/cts/MediaPlayerTest.java
db63d0a60274ec4bc8cd1435499610ba024f9acb 17-Jul-2014 Andy Hung <hunga@google.com> am 5d2c1f46: Merge "Update AudioTrackTest to handle multiple PCM formats DO NOT MERGE" into lmp-dev

* commit '5d2c1f465dd956da5c258d68219a3799ff176c12':
Update AudioTrackTest to handle multiple PCM formats DO NOT MERGE
4045c904024bfc99e430601bddeba5c292aa8f2a 09-Jul-2014 Andy Hung <hunga@google.com> Update AudioTrackTest to handle multiple PCM formats DO NOT MERGE

Updated testPlayStreamData.
Removed testPlayStreamFloat (now integrated into testPlayStreamData).
Added testPlayStreamByteBuffer.
Minor change to AudioTrack_ListenerTest.java to reflect additional
parameter in buffer creation method createSoundDataInByteArray.

Change-Id: Ic965c45e94cddd312433cb6a1e40e4718397fead
(cherry picked from commit 44bb161bd45d3d1a6c398e72078e4e73494e226a)
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
6ae56056cd6f7936e6deb4e0dcfbce2da49a0e22 15-Jul-2014 Chong Zhang <chz@google.com> am 052ad4d7: Merge "cts - MediaCodec async callbacks - DO NOT MERGE" into lmp-dev

* commit '052ad4d744487232e64ef1a556fe550600ead8ed':
cts - MediaCodec async callbacks - DO NOT MERGE
14186fad16ea1c121f91f8b62f2cae716e5fe47c 09-Jul-2014 Chong Zhang <chz@google.com> cts - MediaCodec async callbacks - DO NOT MERGE

Bug: 11990118

Change-Id: I1108747cef38f94e36efa50651904467420cc011
rc/android/media/cts/Vp8CodecTestBase.java
rc/android/media/cts/Vp8EncoderTest.java
022a1139d87b650bd0e2025c15228a504ade9798 14-Jul-2014 Lajos Molnar <lajos@google.com> am 9a011c64: Fix build

* commit '9a011c64b7bad9f7bb406e766149e8b8d189c22a':
Fix build
18cc72b188a5dfa456d198d46f797419f3625ab2 14-Jul-2014 Naveen Kumar Ponnusamy <naveenkumar.p@ittiam.com> am 1270fd98: Added support for HEVC decoder testing

* commit '1270fd98598ed6983803f895a7579e89dd6220d5':
Added support for HEVC decoder testing
5b60d5b94f5661e7684c15df2c6993bee0bc38df 14-Jul-2014 Keun-young Park <keunyoung@google.com> am 75fe91ab: Merge "improve TestVirtualDisplayRecycles to reduce memory usage"

* commit '75fe91ab98439c60d8e1e8209108b3938ab67562':
improve TestVirtualDisplayRecycles to reduce memory usage
75fe91ab98439c60d8e1e8209108b3938ab67562 14-Jul-2014 Keun-young Park <keunyoung@google.com> Merge "improve TestVirtualDisplayRecycles to reduce memory usage"
9a011c64b7bad9f7bb406e766149e8b8d189c22a 13-Jul-2014 Lajos Molnar <lajos@google.com> Fix build

Change-Id: I4bf32cf43b7d3aae31ce85f5364d0319ecf6e239
rc/android/media/cts/DecoderTest.java
1270fd98598ed6983803f895a7579e89dd6220d5 03-Jun-2014 Naveen Kumar Ponnusamy <naveenkumar.p@ittiam.com> Added support for HEVC decoder testing

Bug: 14571712
Change-Id: I640e73b7f50837bdc246440db7e5327ccd4e7dc8
es/raw/video_1280x720_mp4_hevc_1150kbps_30fps_aac_stereo_128kbps_48000hz.mp4
es/raw/video_480x360_mp4_hevc_325kbps_30fps_aac_stereo_128kbps_48000hz.mp4
es/raw/video_480x360_mp4_hevc_650kbps_30fps_aac_stereo_128kbps_48000hz.mp4
rc/android/media/cts/AdaptivePlaybackTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaCodecCapabilitiesTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaRandomTest.java
bb5b8e99e9c0777f50f2c61a727bbca46d3a9317 07-Jul-2014 Liu, KaiX Z <kaix.z.liu@intel.com> Fix Gfx buffer leak in cts EncodeVirtualDisplayWithCompositionTest

There is a Gfx memory leak issue in latest CTS4.4R3 media
EncodeVirtualDisplayWithCompositionTest. We can run
EncodeVirtualDisplayWithCompositionTest testVirtualDisplayRecycles
on Nexus5. If we change the outer loop count(NUM_CODEC_CREATION)to 15,
you will found the the test will fail because test app is killed by OOM.

If you add some code to track the VDS creation and destory
in SurfaceFlinger, you will find there is always one VDS leaked in each
outer loop. The surface has 3 1080P surfaces in it and the Gfx memory
leak is serious.

After some debugging with the test app, found the issue is at
GlCompositor::CompositionRunnable::Run function, the test try to get
thread looper before its prepare. It will return null and it makes
the thread can't exit correctly.

Change-Id: Ie84c4c0abc6fd090d4b319d6560aff1e0a595f77
Signed-off-by: Liu, KaiX Z <kaix.z.liu@intel.com>
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
5ab3aa29c2cc7758bd5d3925909ab2d89451d123 02-Jul-2014 Lajos Molnar <lajos@google.com> am 2e5734fc: am 80c4006d: Merge "EncodeDecodeTest: also check BT.709 yuv -> rgb"

* commit '2e5734fcee881b99933869fc6fb754dbf517651b':
EncodeDecodeTest: also check BT.709 yuv -> rgb
2e5734fcee881b99933869fc6fb754dbf517651b 02-Jul-2014 Lajos Molnar <lajos@google.com> am 80c4006d: Merge "EncodeDecodeTest: also check BT.709 yuv -> rgb"

* commit '80c4006d31f9b8ec9c7b01426677a948d71ba9a6':
EncodeDecodeTest: also check BT.709 yuv -> rgb
caf25cf58f45c3c2039de16d37242deab0e45c57 02-Jul-2014 Harry Hong <harryhong77@gmail.com> improve TestVirtualDisplayRecycles to reduce memory usage

TestVirtualDisplayRecycles allocates lots of memory.
in low memory system, this test get failed because
android.media.cts process died by low-memory killer easily.

To prevent low memory case during test,
- clear the allocated buffer for dalvik to get more chance
to do GC at window cleanup
- call cleanupGl() at stopComposition

Change-Id: I1c118ceba9dfe29a84bd9edad43eac21ba50a92b
Signed-off-by: Harry Hong <hhong@nvidia.com>
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
80c4006d31f9b8ec9c7b01426677a948d71ba9a6 02-Jul-2014 Lajos Molnar <lajos@google.com> Merge "EncodeDecodeTest: also check BT.709 yuv -> rgb"
b9d4012406bca597907417dc0a99b2671e2a78c6 01-Jul-2014 Cheng-Jung Ho <Cheng-Jung.Ho@mediatek.com> am 81e07851: am 851d3928: am 9bf3d08b: am 0982641e: Fix CTS EncodeVirtualDIsplayWithCompositionTest memory leak

* commit '81e078517e0bb594f6565d87ab5efbc972161aca':
Fix CTS EncodeVirtualDIsplayWithCompositionTest memory leak
81e078517e0bb594f6565d87ab5efbc972161aca 01-Jul-2014 Cheng-Jung Ho <Cheng-Jung.Ho@mediatek.com> am 851d3928: am 9bf3d08b: am 0982641e: Fix CTS EncodeVirtualDIsplayWithCompositionTest memory leak

* commit '851d3928b408bd29428ef0056edbb93fc72b8b4b':
Fix CTS EncodeVirtualDIsplayWithCompositionTest memory leak
851d3928b408bd29428ef0056edbb93fc72b8b4b 01-Jul-2014 Cheng-Jung Ho <Cheng-Jung.Ho@mediatek.com> am 9bf3d08b: am 0982641e: Fix CTS EncodeVirtualDIsplayWithCompositionTest memory leak

* commit '9bf3d08bbc9ba9ba102854b2cb68e28b8b1f68bc':
Fix CTS EncodeVirtualDIsplayWithCompositionTest memory leak
0982641ec50b12f5f8b0af65399a278a53885b32 25-Jun-2014 Cheng-Jung Ho <Cheng-Jung.Ho@mediatek.com> Fix CTS EncodeVirtualDIsplayWithCompositionTest memory leak

Calling Looper.myLooper() before Looper.prepare() will get NULL handler and can
not free related operations in the end of this test.
In previous version of CTS, the Looper.prepare() is before the Looper.myLooper()
Rollback to previous version to fix this issue.

Bug: 15761704

Change-Id: Ie6bd3060053738887824d910ad1d14f721dd8db8
Signed-off-by: Cheng-Jung Ho <Cheng-Jung.Ho@mediatek.com>
(cherry picked from commit 644eac5ac8988dba3ac3184e4cab4b7ae3142f41)
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
b7fd509058a5bf45acdf771f98512bb85e0fe7e2 30-Jun-2014 Narayan Kamath <narayan@google.com> am 017fedbb: Merge "Fix a few issues in MediaMuxerTest."

* commit '017fedbb857f083dc71be4103ed3a41b584b80c4':
Fix a few issues in MediaMuxerTest.
3c47e72661839b7f3d947b3abbd2dca9d2528b3e 25-Jun-2014 Edwin Wong <edwinwong@google.com> Add Clear Key test.

bug: 12035506
Change-Id: I22d54e8d0361d0419710aac3659f71f558923dee
rc/android/media/cts/ClearKeySystemTest.java
rc/android/media/cts/CodecState.java
rc/android/media/cts/MediaCodecCencPlayer.java
rc/android/media/cts/NonBlockingAudioTrack.java
300cd70d2984cc7a3b9c9528ac4d9095501d0841 30-Jun-2014 Narayan Kamath <narayan@google.com> am b7fd5090: am 017fedbb: Merge "Fix a few issues in MediaMuxerTest."

* commit 'b7fd509058a5bf45acdf771f98512bb85e0fe7e2':
Fix a few issues in MediaMuxerTest.
0fcca0a4c54ef0650561ffde79273b3e72425f9c 27-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Test audio time stamp ordering"
4fb780bd6fd88ba313765034fbf799d9d7fc9002 26-Jun-2014 Tsu Chiang Chuang <tsu@google.com> fix cts media drm tests to handle ResourceBusyException.

Change-Id: I38dd1abca9aa97fc3909daa66fcb1d0d3f147554
rc/android/media/cts/MediaDrmMockTest.java
234a74cafe6c7c2cd69fe5f0a031f1dccbc3f58b 25-Jun-2014 Marco Nelissen <marcone@google.com> Test audio time stamp ordering

b/15755476

Change-Id: I7e9a9406059153b2b61df796bd0d7c42b2fbf80f
es/raw/sinesweeptsaac.m4a
rc/android/media/cts/DecoderTest.java
6106275ed8c0feb3cfb64eca1a0532299c6a01c5 25-Jun-2014 Narayan Kamath <narayan@google.com> Fix a few issues in MediaMuxerTest.

- The test refers to hard coded paths in /sdcard that are
not guaranteed to exist, besides it's bad practice since
a failing test can leave residual files behind.

- Fix broken lat/long parsing that would only work in the
western hemisphere.

NOTE: The delta check for latitudes and longitudes look
broken as well, but I didn't dig into it.

Change-Id: I6b164ede18e1847f17353166fcdd9d8e091c397b
rc/android/media/cts/MediaMuxerTest.java
4303bfdd10696123b4aacf066106d3dffd1bc915 20-Jun-2014 Marco Nelissen <marcone@google.com> Merge "Check for correct frame ordering"
fbd9e3be5ad414928f5efeae30bda1eda57eee3b 20-Jun-2014 Marco Nelissen <marcone@google.com> Check for correct frame ordering

Check that B frames come out of the decoder in the correct order,
for both fragmented and non-fragmented h264 mp4 files.

The new test files were created with:

ffmpeg -i video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4\
-f mp4 -vcodec h264 -profile:main -acodec copy video_h264_main_b_frames.mp4
and
ffmpeg -i video_h264_main_b_frames.mp4 -f mp4\
-movflags frag_keyframe+empty_moov -codec copy\
video_h264_main_b_frames_frag.mp4

Change-Id: I33b4ced8688ab606689d7e8390caf1082c9df0c1
es/raw/video_h264_main_b_frames.mp4
es/raw/video_h264_main_b_frames_frag.mp4
rc/android/media/cts/DecoderTest.java
869ddced89ffa7da76328e22bc084e8f59d6fa13 18-Jun-2014 Andy Hung <hunga@google.com> Add CTS test for AudioTrack float playback

Bug: 15720368
Change-Id: I577f113d64e1f7d302430601c11704a42c65a86e
rc/android/media/cts/AudioTrackTest.java
7e9dad997996ab081c2071086cde277546f579c8 11-Jun-2014 Lenka Trochtova <ltrochtova@google.com> am d847f2cf: Do not test that AVC Baseline Profile is supported in MediaCodecCapabilitiesTest. It is already done in MediaCodecListTest#testIsAVCBaselineProfileSupported.

* commit 'd847f2cfd886448a1b90a25a5ecf9b6ba1b8b4e0':
Do not test that AVC Baseline Profile is supported in MediaCodecCapabilitiesTest. It is already done in MediaCodecListTest#testIsAVCBaselineProfileSupported.
d847f2cfd886448a1b90a25a5ecf9b6ba1b8b4e0 09-Jun-2014 Lenka Trochtova <ltrochtova@google.com> Do not test that AVC Baseline Profile is supported in MediaCodecCapabilitiesTest. It is already done in MediaCodecListTest#testIsAVCBaselineProfileSupported.

b/15320804

Change-Id: I7e6435da2f611dfa6970b0bd36aa8deea61e5e83
rc/android/media/cts/MediaCodecCapabilitiesTest.java
f40c867e840a3419aa2e9bdbd00fbb85dfbb8098 11-Jun-2014 Jason Parks <jparks@google.com> am fc0aa46e: Merge "Fix EncodeVirtualDisplayTest CTS test." into klp-modular-dev

* commit 'fc0aa46e8463be62f5c24af7fc9706e856a3b45e':
Fix EncodeVirtualDisplayTest CTS test.
fc0aa46e8463be62f5c24af7fc9706e856a3b45e 11-Jun-2014 Jason Parks <jparks@google.com> Merge "Fix EncodeVirtualDisplayTest CTS test." into klp-modular-dev
2d89c46ee6bdfb02663b07a56baa461ddf64ed3a 11-Jun-2014 Lenka Trochtova <ltrochtova@google.com> am 7e9dad99: am d847f2cf: Do not test that AVC Baseline Profile is supported in MediaCodecCapabilitiesTest. It is already done in MediaCodecListTest#testIsAVCBaselineProfileSupported.

* commit '7e9dad997996ab081c2071086cde277546f579c8':
Do not test that AVC Baseline Profile is supported in MediaCodecCapabilitiesTest. It is already done in MediaCodecListTest#testIsAVCBaselineProfileSupported.
22857c497662d65824be651a03fc6dac870d8935 11-Jun-2014 Jason Parks <jparks@google.com> am f40c867e: am fc0aa46e: Merge "Fix EncodeVirtualDisplayTest CTS test." into klp-modular-dev

* commit 'f40c867e840a3419aa2e9bdbd00fbb85dfbb8098':
Fix EncodeVirtualDisplayTest CTS test.
f507c88b5f20b34e6c6013d09dd730f87e36e658 11-Jun-2014 Zhijun He <zhijunhe@google.com> Update CTS for 4K video recording support

Bug: 15287656
Change-Id: I31b43efa1ea881244a35916082a5889c79cf2b3d
rc/android/media/cts/CamcorderProfileTest.java
e7a33637e0f233ec6e4cd5247b3dd4691fb281e3 10-Jun-2014 Andrew Lewis <andrewlewis@google.com> am 697af6f5: Make MediaCodecTest tests only test existing codecs on the device

* commit '697af6f5994dcf2b65f09289c4f390f970669f09':
Make MediaCodecTest tests only test existing codecs on the device
697af6f5994dcf2b65f09289c4f390f970669f09 06-Jun-2014 Andrew Lewis <andrewlewis@google.com> Make MediaCodecTest tests only test existing codecs on the device

Return from the tests, passing, if no codec can be acquired for a given type.

Bug: 15318995
Change-Id: I837d202c8fba7d9f4ddfff05369c4e99765e88d5
rc/android/media/cts/MediaCodecTest.java
db2e4abb00f8acafd69176c37aebd8fd91001123 09-Jun-2014 Unsuk Jung <unsuk@google.com> am 9180dcfb: Merge "Skip VP8 encode test on devices without VP8" into klp-modular-dev

* commit '9180dcfb765abf1efb48867b5a19faba86024640':
Skip VP8 encode test on devices without VP8
02434daeb5069b4dbf30442efb7764c8365d5608 09-Jun-2014 Johann <johannkoenig@google.com> am 16db5b88: Require vp8 encoder

* commit '16db5b88fa0065b957bcb30f34924df5b638cdab':
Require vp8 encoder
9180dcfb765abf1efb48867b5a19faba86024640 09-Jun-2014 Unsuk Jung <unsuk@google.com> Merge "Skip VP8 encode test on devices without VP8" into klp-modular-dev
16db5b88fa0065b957bcb30f34924df5b638cdab 09-Jun-2014 Johann <johannkoenig@google.com> Require vp8 encoder

Change-Id: Id092d081b5523e0d39361b1098c5a6ca00d32bae
(cherry picked from commit 7c6e6169fcea7ee251c577b9e81b5782c6363650)
rc/android/media/cts/MediaCodecListTest.java
7c6e6169fcea7ee251c577b9e81b5782c6363650 09-Jun-2014 Johann <johannkoenig@google.com> Require vp8 encoder

Change-Id: Id092d081b5523e0d39361b1098c5a6ca00d32bae
rc/android/media/cts/MediaCodecListTest.java
747f06e1cdd2ef2394d145c3d3ba29d567f9cb06 06-Jun-2014 Johann <johannkoenig@google.com> Skip VP8 encode test on devices without VP8

BUG=15321261

Change-Id: I2446d7297342be2f0b953c2eb55107b675625a40
rc/android/media/cts/Vp8EncoderTest.java
0c3bc98aceed1e68a87c03c54b21ecea353685c3 06-Jun-2014 Jason Parks <jparks@google.com> Fix EncodeVirtualDisplayTest CTS test.

If there are no media codecs present, then don’t
run the test.

Bug: 15449286
Change-Id: I44d34fb75d9bd2b25f1b95faa02a7078c532f045
rc/android/media/cts/EncodeVirtualDisplayTest.java
917565bb103955409e2a694661dbdb334d416f52 30-May-2014 keunyoung <keunyoung@google.com> am ed9c20a6: am e11f168a: skip CompositionTest if avc encoding is not supported.

* commit 'ed9c20a6c687d4675212524ede55091fd8099de6':
skip CompositionTest if avc encoding is not supported.
ed9c20a6c687d4675212524ede55091fd8099de6 30-May-2014 keunyoung <keunyoung@google.com> am e11f168a: skip CompositionTest if avc encoding is not supported.

* commit 'e11f168a3289b22c73baf2d817e541d1c8a7a657':
skip CompositionTest if avc encoding is not supported.
e11f168a3289b22c73baf2d817e541d1c8a7a657 29-May-2014 keunyoung <keunyoung@google.com> skip CompositionTest if avc encoding is not supported.

bug: 15321262
Change-Id: Ic9dac2d63f750c074d1ec8f592456a2c2c310571
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
9ff4d5625b0a647eec4e396d8485ba45d581027e 29-May-2014 Marco Nelissen <marcone@google.com> getSampletime is now getSampleTime

Change-Id: I27f6d5c61da4a3e198734df8a763c9cfbc2d585f
ibmediandkjni/native-media-jni.cpp
510ccf0bf802726ea72fd963974dcccc48940e41 28-May-2014 Lajos Molnar <lajos@google.com> Merge "media.Vp8EncoderTest: comment out asynchronous testing"
015ab0eb5461df156de94f61b28b58b45babace5 28-May-2014 Lajos Molnar <lajos@google.com> media.Vp8EncoderTest: comment out asynchronous testing

Bug: 15091403
Change-Id: Ibcae5aa99f40ce5efb0c006a11ed6fd4efddc829
rc/android/media/cts/Vp8CodecTestBase.java
rc/android/media/cts/Vp8EncoderTest.java
08f9586f0543bf1a376cc4a1cbb710efeeffae8a 27-May-2014 Marco Nelissen <marcone@google.com> Merge "Remove callback test"
04e01d9e154c7d01b1e3ef3b99a7e519d0553720 27-May-2014 Unsuk Jung <unsuk@google.com> am 8d6148cd: am 209af33a: Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor" into klp-dev

* commit '8d6148cd807ea1dcb6f03771086e6a2161bdf9f4':
Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor
209af33ada8796ed4b27d96bc6d625a08a015813 27-May-2014 Unsuk Jung <unsuk@google.com> Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor" into klp-dev
8c2da24389c4b868e8a91c052f85eca8f4dc4846 24-May-2014 Marco Nelissen <marcone@google.com> Remove callback test

Change-Id: I859dcabb57ab59558b000fb8be4caa07471942a6
ibmediandkjni/native-media-jni.cpp
rc/android/media/cts/NativeDecoderTest.java
b3b0b3bfdf93f697f8b209801c6f13217de0ad6b 23-May-2014 Lajos Molnar <lajos@google.com> am bead3a8c: Merge "DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs" into klp-modular-dev

* commit 'bead3a8ca7ab0c006ec3e47d89e6303eba01fe24':
DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs
1f15761623ae95a4a77cafdca057063e16f53a18 20-May-2014 Lajos Molnar <lajos@google.com> DO NOT MERGE: media: AdaptivePlaybackTest: properly handle missing codecs

(cherry picked from commit e5768fcc64369eaf18ae8bf7ef197eedc4510fb6)
Updated for API 20

Bug: 15081617
Change-Id: Ia9425600764f581cdc1977b54f2e774dbabdadd0
rc/android/media/cts/AdaptivePlaybackTest.java
4ebdb0bd9d50caeea686e73a594445b3a4780d61 22-May-2014 Unsuk Jung <unsuk@google.com> am 4a36a971: am f2aef5d8: Merge "Revert "media: AdaptivePlaybackTest: properly handle missing codecs"" into klp-modular-dev

* commit '4a36a971d33c161bca52a6b31a130765007506d3':
Revert "media: AdaptivePlaybackTest: properly handle missing codecs"
4a36a971d33c161bca52a6b31a130765007506d3 22-May-2014 Unsuk Jung <unsuk@google.com> am f2aef5d8: Merge "Revert "media: AdaptivePlaybackTest: properly handle missing codecs"" into klp-modular-dev

* commit 'f2aef5d805bdd2acb7ffb1f0022c0fb24ad8df69':
Revert "media: AdaptivePlaybackTest: properly handle missing codecs"
b4c3de86905142299ac3c7a3ab348ae26dce2690 22-May-2014 Unsuk Jung <unsuk@google.com> Revert "media: AdaptivePlaybackTest: properly handle missing codecs"

This reverts commit 22b958dab483d5087eb89a260535632981bb290e.

Change-Id: I484818ef053c0710ea449ce5e4c65d1b5e9b934b
rc/android/media/cts/AdaptivePlaybackTest.java
5f594e50fda69e872e6daf049b4ff0dab97307f6 20-May-2014 Lajos Molnar <lajos@google.com> media: AdaptivePlaybackTest: properly handle missing codecs

Bug: 15081617
Change-Id: Idb86b4dafe1de58e7019311c85cf9a1d2ccc029f
(cherry picked from commit e5768fcc64369eaf18ae8bf7ef197eedc4510fb6)
rc/android/media/cts/AdaptivePlaybackTest.java
22b958dab483d5087eb89a260535632981bb290e 20-May-2014 Lajos Molnar <lajos@google.com> media: AdaptivePlaybackTest: properly handle missing codecs

Bug: 15081617
Change-Id: Idb86b4dafe1de58e7019311c85cf9a1d2ccc029f
(cherry picked from commit e5768fcc64369eaf18ae8bf7ef197eedc4510fb6)
rc/android/media/cts/AdaptivePlaybackTest.java
11741abf5c67ef97ec1a0457a690ed41ed7d0660 21-May-2014 Marco Nelissen <marcone@google.com> Update for API change

Change-Id: I1a91d9af924c8ba8493f19b53d4e23a5fd57f5f5
ibmediandkjni/native-media-jni.cpp
c6bc7e2e4c6f253bdb0cbde0c40914caf490bd1f 20-May-2014 Marco Nelissen <marcone@google.com> Merge "Use cryptoinfo_mode_t type instead of int"
2aa8b78afb532ef918df7adc24b859132208cac0 20-May-2014 Marco Nelissen <marcone@google.com> Use cryptoinfo_mode_t type instead of int

Change-Id: Id2051290e7fb77a3c3ed64ffbe95893018510600
ibmediandkjni/native-media-jni.cpp
097fd5cc6743096bde7486c1f13d405c8aecdec0 20-May-2014 Lajos Molnar <lajos@google.com> Merge "media: AdaptivePlaybackTest: properly handle missing codecs"
e5768fcc64369eaf18ae8bf7ef197eedc4510fb6 20-May-2014 Lajos Molnar <lajos@google.com> media: AdaptivePlaybackTest: properly handle missing codecs

Bug: 15081617
Change-Id: Idb86b4dafe1de58e7019311c85cf9a1d2ccc029f
rc/android/media/cts/AdaptivePlaybackTest.java
a4bb696c3c3e8268f7aaca7515f2a3ec196af57c 19-May-2014 Lajos Molnar <lajos@google.com> am 82eccf61: am 3c59e8e4: am 1613f475: am 0f1613c8: Merge "media: Refactor and improve robustness of AdaptivePlaybackTest" into klp-dev

* commit '82eccf61f35cb8b9eb0c524c28841147f646e353':
media: Refactor and improve robustness of AdaptivePlaybackTest
82eccf61f35cb8b9eb0c524c28841147f646e353 19-May-2014 Lajos Molnar <lajos@google.com> am 3c59e8e4: am 1613f475: am 0f1613c8: Merge "media: Refactor and improve robustness of AdaptivePlaybackTest" into klp-dev

* commit '3c59e8e476541e4456323c62f0d09d59dacdcf8c':
media: Refactor and improve robustness of AdaptivePlaybackTest
3c59e8e476541e4456323c62f0d09d59dacdcf8c 19-May-2014 Lajos Molnar <lajos@google.com> am 1613f475: am 0f1613c8: Merge "media: Refactor and improve robustness of AdaptivePlaybackTest" into klp-dev

* commit '1613f475b0ba4aad446ed0853e2654d3a98e6509':
media: Refactor and improve robustness of AdaptivePlaybackTest
9ded750582419c03a81ea20318d60b60e3e25215 19-May-2014 Emiel de Kock <edekock@broadcom.com> EncodeDecodeTest: also check BT.709 yuv -> rgb

Some devices use BT.709 colour-space conversion coefficients when
converting HD (i.e. >= 720p) images from YUV to RGB.

b/14930861

Change-Id: I2c339cd05543c424c08d5377b1466e43e27d623c
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
rc/android/media/cts/EncodeDecodeTest.java
7febd5faa3809f28d3719c7ce3c9b327fc3c55ec 15-May-2014 Lajos Molnar <lajos@google.com> media: Refactor and improve robustness of AdaptivePlaybackTest

Bug: 14793152
Change-Id: I47022e24c82c7ff5dd0e8b7bd23f3b001a0ece6f
rc/android/media/cts/AdaptivePlaybackTest.java
b5cf2c1934c0d53cc93e13100c8950e78066bd76 12-May-2014 Marco Nelissen <marcone@google.com> Crypto tests

Test for AMediaExtractor_getPsshInfo and AMediaCodecCryptoInfo

Change-Id: Ia65a2275fa683b2f8d6bbbd046fbf03508fc2926
ibmediandkjni/native-media-jni.cpp
es/raw/psshtest.mp4
rc/android/media/cts/NativeDecoderTest.java
a8c7dadf6e231346c9fd50f4223f1842a29c8129 08-May-2014 Marco Nelissen <marcone@google.com> CTS test for native media callback

Change-Id: Idd67584b67f283c36183cd4dbd685ac2db5df957
ibmediandkjni/native-media-jni.cpp
rc/android/media/cts/NativeDecoderTest.java
c5967a10a47f8d43c32fc19f7fb984ad1d4a0d54 08-May-2014 Marco Nelissen <marcone@google.com> Update for renamed methods

Change-Id: I37c8e9d3b116c7cd7a328744834a85a4bf3f6d6c
ibmediandkjni/native-media-jni.cpp
47370c5fe54d9f308d86ed4ffd6a663395b32ada 07-May-2014 Marco Nelissen <marcone@google.com> CTS test for AMediaFormat setters and getters

Change-Id: I51fbab357e458aff48dedb4aca8b3dee04f2359a
ibmediandkjni/native-media-jni.cpp
rc/android/media/cts/NativeDecoderTest.java
fcc17215914d50e02b1b8ee705593964ffc84cf6 07-May-2014 Marco Nelissen <marcone@google.com> CTS test for native mediamuxer

Change-Id: I979a7b7b4894c9eae16f11d2e3ed71e51120f20e
ibmediandkjni/native-media-jni.cpp
rc/android/media/cts/NativeDecoderTest.java
d04da01973d1db58f2d926a6dc701b6cc97ebd7a 01-May-2014 Marco Nelissen <marcone@google.com> WIP: CTS test for ndk mediacodec apis, plain C version

Change-Id: Ib98f9e190b8c1074b21aa9fb88047434755b6150
ndroid.mk
ibmediandkjni/Android.mk
ibmediandkjni/native-media-jni.cpp
rc/android/media/cts/NativeDecoderTest.java
326b1127964c2d44ba0fb41cfedbe221bb13ba6b 02-May-2014 Zhijun He <zhijunhe@google.com> Merge "Add ImageReader CTS test for MediaCodec"
d6fb6247be0a9276f7b9875009c5ade645e446ce 30-Apr-2014 Bill Yi <byi@google.com> Merge klp-dev-plus-aosp into stage-aosp-master

Change-Id: Ib7b1888248402804ce55782f52d08bf17fb434de
5b618b702ee16ed08b6bda7ff86ec0f50fd0561e 25-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 1305fcba: am dddd8f60: am b92c3175: Fix StreamingMediaPlayerTest

* commit '1305fcba055b7d8f23d2d1023e54b75150bda160':
Fix StreamingMediaPlayerTest
1305fcba055b7d8f23d2d1023e54b75150bda160 25-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am dddd8f60: am b92c3175: Fix StreamingMediaPlayerTest

* commit 'dddd8f60c9e3f1bdcc02bf436a2b78776554a487':
Fix StreamingMediaPlayerTest
b92c3175f9f5f6ddaeb263d59814cb50c1174028 21-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> Fix StreamingMediaPlayerTest

Format 18 videos are now 640x360

Bug: 10388187
Change-Id: Ida5572028e423dff99eda0a94b5466f4e5e4180a
(cherry picked from commit 835f1d130793581ec21d4a346aad15a993cc6d26)
rc/android/media/cts/StreamingMediaPlayerTest.java
0f324be37fe822bf7b97f8797cf48e8ca92f92fd 17-Apr-2014 Stuart Scott <stuartscott@google.com> am 34d4ac36: am 8e30bbc7: am 24da606d: Merge "DO NOT MERGE Replace deprecated YouTube streamer urls" into jb-dev

* commit '34d4ac365c975058e7f140193d5feee1b338cb8d':
DO NOT MERGE Replace deprecated YouTube streamer urls
34d4ac365c975058e7f140193d5feee1b338cb8d 17-Apr-2014 Stuart Scott <stuartscott@google.com> am 8e30bbc7: am 24da606d: Merge "DO NOT MERGE Replace deprecated YouTube streamer urls" into jb-dev

* commit '8e30bbc761c952522fbfcadf09813c093accf1fc':
DO NOT MERGE Replace deprecated YouTube streamer urls
08f2661615b33687e000a3909455b609d4a461da 19-Jun-2013 Bryan Mawhinney <bryanmawhinney@google.com> DO NOT MERGE Replace deprecated YouTube streamer urls

Bug: 7688709
Change-Id: I33251dc173d7acc4a6d111c704d8a6464d0040c8

Conflicts:
tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
ad5d23e97b2c874e4477f03bf13f5774a8ec6e9b 25-Mar-2014 Hurri Lu <jlu32@marvell.com> Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor

Bug: 13564774

200ms are not enough to ensure the presentation to finish render for some devices
with low end process in such heavy system loading scenario.

The fix suggestion is: increase the thread sleep time from 200ms to 400ms for each color rendering.

Change-Id: I7f40c95a53613fb6be3324d5bbbf89a75a12be21
Signed-off-by: Hurri Lu <jlu32@marvell.com>
rc/android/media/cts/EncodeVirtualDisplayTest.java
c9dbea8c86e9a056fae4e23420dd076c7126c256 10-Apr-2014 Andrew Lewis <andrewlewis@google.com> am 1ce28237: am 5cfc04af: am 7fbbcf64: am 01a224f6: am ea930651: am 5c0b1865: Verify output audio sample rate.

* commit '1ce28237e373e1dc23aaf3393a2c5ba48e6fc8fb':
Verify output audio sample rate.
1ce28237e373e1dc23aaf3393a2c5ba48e6fc8fb 10-Apr-2014 Andrew Lewis <andrewlewis@google.com> am 5cfc04af: am 7fbbcf64: am 01a224f6: am ea930651: am 5c0b1865: Verify output audio sample rate.

* commit '5cfc04aff49250cd35103a5c8e375367d08cda96':
Verify output audio sample rate.
5cfc04aff49250cd35103a5c8e375367d08cda96 10-Apr-2014 Andrew Lewis <andrewlewis@google.com> am 7fbbcf64: am 01a224f6: am ea930651: am 5c0b1865: Verify output audio sample rate.

* commit '7fbbcf64ce018c9b06dd4d2dbda933f0b29c75dc':
Verify output audio sample rate.
01a224f63428c20ceec836cc4002d6377b733c4c 10-Apr-2014 Andrew Lewis <andrewlewis@google.com> am ea930651: am 5c0b1865: Verify output audio sample rate.

* commit 'ea930651c9af3c5290d80014f562b5abe80a00e1':
Verify output audio sample rate.
ea930651c9af3c5290d80014f562b5abe80a00e1 10-Apr-2014 Andrew Lewis <andrewlewis@google.com> am 5c0b1865: Verify output audio sample rate.

* commit '5c0b18659c36506fdf80d839b8b6e3207c4ae803':
Verify output audio sample rate.
5c0b18659c36506fdf80d839b8b6e3207c4ae803 09-Apr-2014 Andrew Lewis <andrewlewis@google.com> Verify output audio sample rate.

Check that the sample rate of the audio format in the output file matches the
expected sample rate, taking into account spectral band replication (SBR) which
halves the sample rate in the header.

All tests verify the output audio at the moment, but new tests can be added
later where the functionality is disabled (in order to make other verifications
independently).

Copied from ag/407162.

Bug: 11819504
Change-Id: Ieec9fe253c1abb36bece725f6c8d3aea9c2f515f
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
df1907a8bfd1a1922026702ee4d557a680daa919 20-Jun-2013 Zhijun He <zhijunhe@google.com> Add ImageReader CTS test for MediaCodec

Test ImageReader with MediaCodec decoder. Decode a stream, feed to MediaCodec,
read the decoded frame and validate the data.

Change-Id: Ie5d2cb587550cb3ee304605c4727dd4f38bcd8df
rc/android/media/cts/ImageReaderDecoderTest.java
eba2d5e7efcb9da29627dab84135b20174e88733 07-Apr-2014 Stuart Scott <stuartscott@google.com> am ba5b3a43: am 055846ca: Merge "Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue"

* commit 'ba5b3a43dcb975d71b87b9c27b27b64844122987':
Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue
ba5b3a43dcb975d71b87b9c27b27b64844122987 07-Apr-2014 Stuart Scott <stuartscott@google.com> am 055846ca: Merge "Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue"

* commit '055846cad3d9e8a22e038bc1f2c575ccd5210db7':
Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue
055846cad3d9e8a22e038bc1f2c575ccd5210db7 07-Apr-2014 Stuart Scott <stuartscott@google.com> Merge "Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue"
62c647b9cb84de463ceebb7f9b9cbb9b0ba6ca4f 04-Apr-2014 Glenn Kasten <gkasten@google.com> am b07a2576: am 2ba29e86: am 2bbdb203: Merge "AudioTrackTest: added testGetTimestamp." into klp-dev

* commit 'b07a257699cbde3a44c80395338c3663d722bbee':
AudioTrackTest: added testGetTimestamp.
b07a257699cbde3a44c80395338c3663d722bbee 04-Apr-2014 Glenn Kasten <gkasten@google.com> am 2ba29e86: am 2bbdb203: Merge "AudioTrackTest: added testGetTimestamp." into klp-dev

* commit '2ba29e86443472107834f56abbe2dd54b9cf6aed':
AudioTrackTest: added testGetTimestamp.
2bbdb2034be1ef8e1a75501f68c5eb4efd3c186e 04-Apr-2014 Glenn Kasten <gkasten@google.com> Merge "AudioTrackTest: added testGetTimestamp." into klp-dev
1180bd12cee98610f0ab560c78644dc0e43e3f8f 03-Apr-2014 keunyoung <keunyoung@google.com> am e01190cb: am d5e99f44: am 7eda6255: am 6a9a9a8e: Merge "fix NPE during tear down" into klp-dev

* commit 'e01190cbc4f220e8a0722b4b7977f3ae51f9862c':
fix NPE during tear down
e01190cbc4f220e8a0722b4b7977f3ae51f9862c 03-Apr-2014 keunyoung <keunyoung@google.com> am d5e99f44: am 7eda6255: am 6a9a9a8e: Merge "fix NPE during tear down" into klp-dev

* commit 'd5e99f44e17790f5117ec75a302f2edf84beda8d':
fix NPE during tear down
005793f3837654cea5c0073d21421011ba17e287 03-Apr-2014 Alex Glaznev <glaznev@google.com> Merge "Add CTS VP8 asynchronous encoding tests."
d5e99f44e17790f5117ec75a302f2edf84beda8d 03-Apr-2014 keunyoung <keunyoung@google.com> am 7eda6255: am 6a9a9a8e: Merge "fix NPE during tear down" into klp-dev

* commit '7eda62550394982b2dc799733988d0a1185c2a46':
fix NPE during tear down
6a9a9a8e3135e22da974ccc80e55a64ecd01b2d6 03-Apr-2014 keunyoung <keunyoung@google.com> Merge "fix NPE during tear down" into klp-dev
c15fdf616f7c4cd23fe0ad9f069918b234d073e3 25-Mar-2014 Robert Shih <robertshih@google.com> AudioTrackTest: added testGetTimestamp.

testGetTimestamp tests:
1. frames written by client (AudioTrack.write)
>= frames seen by server (AudioTrack.getPlaybackHeadPosition)
>= frames presented to output device (AudioTrack.getTimestamp)
2. The output frequency reported by AudioTrack.getTimestamp remains
stable and lies in the same ballpark as the write frequency.

Bug: 12111220
Change-Id: I538d11ce300212a59877d399316f4404d469da99
rc/android/media/cts/AudioTrackTest.java
694bbdb986a0a5ceef4c47c33eb116146460b62a 03-Apr-2014 keunyoung <keunyoung@google.com> fix NPE during tear down

bug: 13782489
Change-Id: I4807ffd5ed279b76d245b43c9717c94deb499568
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
a8006db3b54d07318dbe593924267980c45d6876 19-Mar-2014 Alex Glaznev <glaznev@google.com> Add CTS VP8 asynchronous encoding tests.

Bug: 11990571

- Add media encoder class to support running the encoder
either in a callee's thread or in a looper thread using
buffer dequeue ready notification callbacks.

- Add a test to ensure the PSNR difference between the
encoded and decoded output and reference yuv input
does not change much for two different ways of the
encoder call.

Change-Id: I67e9ade71dc3120e65c4d9cb96e5fd1dd43928b0
rc/android/media/cts/IvfReader.java
rc/android/media/cts/IvfWriter.java
rc/android/media/cts/Vp8CodecTestBase.java
rc/android/media/cts/Vp8EncoderTest.java
4c6171167dd1b41b13b5bce83b183ce959378e8c 03-Apr-2014 Robert Shih <robertshih@google.com> Merge "AudioTrackTest: added testGetTimestamp."
76116b46eeb8dd193d5259683e56257b8d82ac43 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am f8bf8f4e: am f9d2a05a: am d42731eb: am 0be65d10: am cdcdb525: am 7ba850a7: am 1ecc5756: am 124b360f: am f33efb2d: am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit 'f8bf8f4e1818c50543281031ac070f7cda5ad459':
Fix HLS cts test
f8bf8f4e1818c50543281031ac070f7cda5ad459 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am f9d2a05a: am d42731eb: am 0be65d10: am cdcdb525: am 7ba850a7: am 1ecc5756: am 124b360f: am f33efb2d: am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit 'f9d2a05a6a928d4ed9b847ecdee19a7b60c3782b':
Fix HLS cts test
f9d2a05a6a928d4ed9b847ecdee19a7b60c3782b 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am d42731eb: am 0be65d10: am cdcdb525: am 7ba850a7: am 1ecc5756: am 124b360f: am f33efb2d: am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit 'd42731eb0121c28fc0ed74538d28b903ba0c5d7c':
Fix HLS cts test
0be65d105fb55f5c255308e1010ca53706f860ab 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am cdcdb525: am 7ba850a7: am 1ecc5756: am 124b360f: am f33efb2d: am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit 'cdcdb5252919c78685765c97ee5f31d5e2c19a8d':
Fix HLS cts test
cdcdb5252919c78685765c97ee5f31d5e2c19a8d 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 7ba850a7: am 1ecc5756: am 124b360f: am f33efb2d: am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit '7ba850a7809483c50b85d7e31362940e5a0edd54':
Fix HLS cts test
7ba850a7809483c50b85d7e31362940e5a0edd54 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 1ecc5756: am 124b360f: am f33efb2d: am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit '1ecc575685bb9f6786e4115a470cdbed1c9ee800':
Fix HLS cts test
124b360f62f56a41bd037b13298f5390c4a5c476 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am f33efb2d: am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit 'f33efb2d21eabcd737af29e9175a812efb4677e4':
Fix HLS cts test
f33efb2d21eabcd737af29e9175a812efb4677e4 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am f3139a82: am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit 'f3139a82d979629569e9a7f0210ecf27bed7b575':
Fix HLS cts test
f3139a82d979629569e9a7f0210ecf27bed7b575 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 0dc2f6ed: am 22fae154: Fix HLS cts test

* commit '0dc2f6edeb006bc7e6cdd3fc3e9792af18031d75':
Fix HLS cts test
22fae1546dc37e3b93843223e3781a3a2f8ca620 02-Apr-2014 Bryan Mawhinney <bryanmawhinney@google.com> Fix HLS cts test

Android's HLS implementation requires "m3u8" in the URL

Bug: 11976053
Change-Id: I28b20806d9b2d3c11178860f690f5e64227e97e9
rc/android/media/cts/StreamingMediaPlayerTest.java
8ce056a6e05a512b022de82028fe8b9c28f0286e 01-Apr-2014 Marco Nelissen <marcone@google.com> am 3f9534ed: am fdcfacb8: am e32ace5e: am 2263bf39: am 9a813dbf: am 3f5541ba: am e0f47127: am c2e38b2f: am 81a36e52: am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit '3f9534edde8520ea5e82d1765b3823880192e7e7':
Test for bug 13652927
3f9534edde8520ea5e82d1765b3823880192e7e7 01-Apr-2014 Marco Nelissen <marcone@google.com> am fdcfacb8: am e32ace5e: am 2263bf39: am 9a813dbf: am 3f5541ba: am e0f47127: am c2e38b2f: am 81a36e52: am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit 'fdcfacb8790f50d600d30140fd71dd617d94a39b':
Test for bug 13652927
fdcfacb8790f50d600d30140fd71dd617d94a39b 01-Apr-2014 Marco Nelissen <marcone@google.com> am e32ace5e: am 2263bf39: am 9a813dbf: am 3f5541ba: am e0f47127: am c2e38b2f: am 81a36e52: am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit 'e32ace5e0987c550ede814534f4db580050aaba0':
Test for bug 13652927
2263bf39c6af9bb8dff5a66105dcba674e569211 01-Apr-2014 Marco Nelissen <marcone@google.com> am 9a813dbf: am 3f5541ba: am e0f47127: am c2e38b2f: am 81a36e52: am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit '9a813dbfb951eba7cf5e452c141c678a0940efde':
Test for bug 13652927
9a813dbfb951eba7cf5e452c141c678a0940efde 01-Apr-2014 Marco Nelissen <marcone@google.com> am 3f5541ba: am e0f47127: am c2e38b2f: am 81a36e52: am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit '3f5541baabaf78a8808b82992743c327c86d067c':
Test for bug 13652927
3f5541baabaf78a8808b82992743c327c86d067c 01-Apr-2014 Marco Nelissen <marcone@google.com> am e0f47127: am c2e38b2f: am 81a36e52: am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit 'e0f471273fb1f68387add9b809eb3b620b9acfa4':
Test for bug 13652927
c2e38b2f7508c1ac4ffc0056e6af2e8e033db84f 01-Apr-2014 Marco Nelissen <marcone@google.com> am 81a36e52: am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit '81a36e52fb9da549d081c9cb9f8d6c93736fb35f':
Test for bug 13652927
81a36e52fb9da549d081c9cb9f8d6c93736fb35f 01-Apr-2014 Marco Nelissen <marcone@google.com> am 101ff6ff: am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit '101ff6ffbd01bb7c43df2469e65e0f8a99a5d0ed':
Test for bug 13652927
101ff6ffbd01bb7c43df2469e65e0f8a99a5d0ed 01-Apr-2014 Marco Nelissen <marcone@google.com> am 6c0e2db8: am 8d73367a: Merge "Test for bug 13652927" into jb-dev

* commit '6c0e2db88802ed0c52b44f086fda53053e845bc0':
Test for bug 13652927
8d73367a15559f78becff8007369ea741f53f67c 01-Apr-2014 Marco Nelissen <marcone@google.com> Merge "Test for bug 13652927" into jb-dev
4639f8b71356bbefb78cdd3c56f22e65391c999e 31-Mar-2014 Marco Nelissen <marcone@google.com> Test for bug 13652927

b/13652927

Change-Id: I52b675324f002e285d85494ffec50e70587cb2cb
es/raw/bug13652927.ogg
rc/android/media/cts/MediaPlayerTest.java
1cf9253aabac3da2a641b285429443eca8334a83 25-Mar-2014 Robert Shih <robertshih@google.com> AudioTrackTest: added testGetTimestamp.

testGetTimestamp tests:
1. frames written by client (AudioTrack.write)
>= frames seen by server (AudioTrack.getPlaybackHeadPosition)
>= frames presented to output device (AudioTrack.getTimestamp)
2. The output frequency reported by AudioTrack.getTimestamp remains
stable and lies in the same ballpark as the write frequency.

Bug: 12111220
Change-Id: I538d11ce300212a59877d399316f4404d469da99
rc/android/media/cts/AudioTrackTest.java
1264adc8fd148e007b4c7b2a745cfd9a79720c23 28-Mar-2014 Unsuk Jung <unsuk@google.com> am 322e7423: am 1c81c7ed: Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor"

* commit '322e7423e3856b0550d0012864c7575d823c0916':
Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor
322e7423e3856b0550d0012864c7575d823c0916 28-Mar-2014 Unsuk Jung <unsuk@google.com> am 1c81c7ed: Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor"

* commit '1c81c7ed17b3bdb750d9aeb2b6c335eeb2d9b359':
Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor
88cf8b1e292be45e99573ba276f89fde2fd5eda1 25-Mar-2014 Hurri Lu <jlu32@marvell.com> Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor

200ms are not enough to ensure the presentation to finish render for some devices
with low end process in such heavy system loading scenario.

The fix suggestion is: increase the thread sleep time from 200ms to 400ms for each color rendering.

Change-Id: I7f40c95a53613fb6be3324d5bbbf89a75a12be21
Signed-off-by: Hurri Lu <jlu32@marvell.com>
rc/android/media/cts/EncodeVirtualDisplayTest.java
20d3399cb2d0d21282b2e123eaeeee73922e64fb 25-Mar-2014 Marco Nelissen <marcone@google.com> Additional tests for CP1251 encoding

Change-Id: Ief85824f97d91861abf8596f56cc6d2d64e2f188
es/raw/cp1251_7.mp3
es/raw/cp1251_8.mp3
rc/android/media/cts/MediaScannerTest.java
735fee49885ee43c2d6032336a161c1922bef865 25-Mar-2014 keunyoung <keunyoung@google.com> am a7f8ceb5: am 1197838f: am c87bb36a: am 372c9f90: Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev

* commit 'a7f8ceb553725148eb4e6da48905f429e141261a':
improve EncodeVirtualDisplayWithCompositionTest to check rendered output
a7f8ceb553725148eb4e6da48905f429e141261a 25-Mar-2014 keunyoung <keunyoung@google.com> am 1197838f: am c87bb36a: am 372c9f90: Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev

* commit '1197838fb259eb2b111a76dc9966c41f7e5a04c6':
improve EncodeVirtualDisplayWithCompositionTest to check rendered output
1197838fb259eb2b111a76dc9966c41f7e5a04c6 25-Mar-2014 keunyoung <keunyoung@google.com> am c87bb36a: am 372c9f90: Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev

* commit 'c87bb36ac76966d078c2418f0615290498d36658':
improve EncodeVirtualDisplayWithCompositionTest to check rendered output
4d35c16a383f17444edccf1620ef67480727bbb7 24-Mar-2014 keunyoung <keunyoung@google.com> am c87bb36a: am 372c9f90: Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev

* commit 'c87bb36ac76966d078c2418f0615290498d36658':
improve EncodeVirtualDisplayWithCompositionTest to check rendered output
372c9f905d2819aab5e68473c4694b52a8ddf773 24-Mar-2014 keunyoung <keunyoung@google.com> Merge "improve EncodeVirtualDisplayWithCompositionTest to check rendered output" into klp-dev
d51e0c83207dabadb0d64d86c2b4fff7ca9bef7f 19-Mar-2014 keunyoung <keunyoung@google.com> improve EncodeVirtualDisplayWithCompositionTest to check rendered output

- use one more virtual display and TextureView
- check output from rendering (only single pixel)

bug: 13529193

Change-Id: I0ec2c2d44ca3a72d9fe7005b82c99a968955ad70
ndroidManifest.xml
es/layout/composition_layout.xml
rc/android/media/cts/CompositionTextureView.java
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
rc/android/media/cts/OutputSurface.java
rc/android/media/cts/RemoteVirtualDisplayService.java
5fb65ca5f599ad8c851eacd8b169674164ddaed3 20-Mar-2014 Marco Nelissen <marcone@google.com> am 11b22b13: am c806f871: am ee83d47b: am c01900ed: am e56b93f4: am 9edcad0c: am a3ab5fbe: Merge "Streaming https test" into jb-dev

* commit '11b22b130c25b77e0cce02ad92d62c10f153eef6':
Streaming https test
11b22b130c25b77e0cce02ad92d62c10f153eef6 20-Mar-2014 Marco Nelissen <marcone@google.com> am c806f871: am ee83d47b: am c01900ed: am e56b93f4: am 9edcad0c: am a3ab5fbe: Merge "Streaming https test" into jb-dev

* commit 'c806f87108f0c8a587edb012e6357749656bd850':
Streaming https test
ee83d47b44e3172bf4d445bf94cd0bfabd479e09 20-Mar-2014 Marco Nelissen <marcone@google.com> am c01900ed: am e56b93f4: am 9edcad0c: am a3ab5fbe: Merge "Streaming https test" into jb-dev

* commit 'c01900ed23cdd34636470ce0f75e8cf4ded0db43':
Streaming https test
c01900ed23cdd34636470ce0f75e8cf4ded0db43 20-Mar-2014 Marco Nelissen <marcone@google.com> am e56b93f4: am 9edcad0c: am a3ab5fbe: Merge "Streaming https test" into jb-dev

* commit 'e56b93f459f986ad8ed05a1bc0f9335f2cd2f43f':
Streaming https test
e56b93f459f986ad8ed05a1bc0f9335f2cd2f43f 20-Mar-2014 Marco Nelissen <marcone@google.com> am 9edcad0c: am a3ab5fbe: Merge "Streaming https test" into jb-dev

* commit '9edcad0c88d4c3005eb4a08245160cf8a902ce8b':
Streaming https test
6fb54a9ef024b2ae8c50fa409f43d4554f5afa35 19-Mar-2014 Marco Nelissen <marcone@google.com> am 3b03c9e0: am 5f0c3f6b: Merge "StreamingMediaPlayerTest: Add a test for redirects in HLS playlists" into klp-dev

* commit '3b03c9e00104f4603ad427c87db2d338bf0a91e1':
StreamingMediaPlayerTest: Add a test for redirects in HLS playlists
29ac7f86ebd993497b4f30f8649aec31ed33f3c1 19-Mar-2014 Marco Nelissen <marcone@google.com> am 66722677: am dca27972: Merge "StreamingMediaPlayerTest: Add tests for HLS served locally" into klp-dev

* commit '66722677772a6b8e90f3e2301b68f4b0c147e29a':
StreamingMediaPlayerTest: Add tests for HLS served locally
93a8c05fe4eab9e5f0c7d106c83a48b465ee4310 19-Mar-2014 Marco Nelissen <marcone@google.com> Merge "Additional encoding detection test. Cleanup."
ca5a9d777352b34863d194a850b021531872a0f7 19-Mar-2014 Marco Nelissen <marcone@google.com> Additional encoding detection test. Cleanup.

Add a testcase for short iso8859-1 tags, which were misdetected as gb81030.
Write the test files with their resource-names for easier debugging.
Clean up the test folder before and after runs.

b/13473604

Change-Id: I9af5fd3e20d820b6b8fcc9cc9deaf54499d65fae
es/raw/iso88591_2.mp3
rc/android/media/cts/MediaScannerTest.java
39229807f74f11b0d764d305cad9f5d2b621d584 11-Feb-2014 Martin Storsjo <martin@martin.st> StreamingMediaPlayerTest: Add a test for redirects in HLS playlists

Cherrypicked from https://android-review.googlesource.com/#/c/81857
b/13174301

Change-Id: Id4eea05b34bc11649336c7765bce7de94e583aa0
rc/android/media/cts/StreamingMediaPlayerTest.java
f536c219edf4c2be958cbeeec9c764006f9d665e 11-Feb-2014 Martin Storsjo <martin@martin.st> StreamingMediaPlayerTest: Add tests for HLS served locally

Also add a test to make sure query strings are handled properly
when interpreting relative URLs, as fixed in frameworks/av
by 8883a38a308.

Cherrypicked from https://android-review.googlesource.com/#/c/81855/
b/13174301

Change-Id: Ic00d58fcef9ed8acb60d426f1453e7f7bab1f455
ssets/hls.m3u8
ssets/segment000000.ts
ssets/segment000001.ts
rc/android/media/cts/StreamingMediaPlayerTest.java
cf28244c2dddf24095c315c8daa10fc4dadbb027 13-Mar-2014 Marco Nelissen <marcone@google.com> Streaming https test

b/13418320

Cherrypicked from c08756abd2b6570901cd791a43def75446466d6a
https://googleplex-android-review.git.corp.google.com/#/c/433330/

Change-Id: I0ac817a3e0b2d7428469c0c1dd775c540aea36b9
rc/android/media/cts/StreamingMediaPlayerTest.java
efb9e3bc1ceb5b32e8594de6918b781b5949cb50 15-Mar-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 4c116b55 to master

Change-Id: I6e2ba6eb2b71331d4adebfc904621c9c698c18fb
4c116b55f13fdc064e8795cc508d173d7df32e89 15-Mar-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of af8f4f63 to klp-modular-dev-plus-aosp

Change-Id: Id04644429e16723f81f6f31aa189eeec283ccb09
357a7badb6b62299067307375691ef75de82e504 14-Mar-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 9e54112b to klp-dev-plus-aosp

Change-Id: I925397baa71ed2f975cda8c7410a56b1b1a7ab19
af8f4f638c8ec4340593286aa7ea1b76dcfe7bb3 14-Mar-2014 Marco Nelissen <marcone@google.com> am 9e54112b: am d1ae4e2e: Merge "Streaming https test" into klp-dev

* commit '9e54112b8012889112363d783c583b84da4a1a44':
Streaming https test
d1ae4e2e72a681a984f960668e4271a8141d5cf2 14-Mar-2014 Marco Nelissen <marcone@google.com> Merge "Streaming https test" into klp-dev
59e7509a5d6fd85d35168bfd3dfe15f4f40a9161 14-Mar-2014 Lajos Molnar <lajos@google.com> am d8ec54b6: am ad563b05: am 780c0b17: media: add AdaptivePlaybackTest suite

* commit 'd8ec54b6ac6ed818d2bcc30ce1bb6357dea54b50':
media: add AdaptivePlaybackTest suite
d8ec54b6ac6ed818d2bcc30ce1bb6357dea54b50 14-Mar-2014 Lajos Molnar <lajos@google.com> am ad563b05: am 780c0b17: media: add AdaptivePlaybackTest suite

* commit 'ad563b0542606580da1e488819c6439f17aea936':
media: add AdaptivePlaybackTest suite
cc47fcf739389e64d96f1bb28bcdffe5496c30fa 14-Mar-2014 Lajos Molnar <lajos@google.com> am ad563b05: am 780c0b17: media: add AdaptivePlaybackTest suite

* commit 'ad563b0542606580da1e488819c6439f17aea936':
media: add AdaptivePlaybackTest suite
8e171521fc2dc58b11eb98cdf0df7d52a5009978 13-Mar-2014 Junjie Hu <junjie.hu@mediatek.com> Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue

This test case will do 720p avc 15fps 6Mbps encoding without query target capabilities that will cause some low end platform out of it's specification can not start this test.
Suggest to apply the query capability first before testing like the behavior of
EncodeVirtualDisplayWithCompositionTest.java

Change-Id: I392741cc5137f91735a33703a4581e07629af9e3
Signed-off-by: Junjie Hu <junjie.hu@mediatek.com>
rc/android/media/cts/EncodeVirtualDisplayTest.java
c08756abd2b6570901cd791a43def75446466d6a 13-Mar-2014 Marco Nelissen <marcone@google.com> Streaming https test

b/13418320

Change-Id: I0ac817a3e0b2d7428469c0c1dd775c540aea36b9
rc/android/media/cts/StreamingMediaPlayerTest.java
780c0b17e9bea8953e7cbd32cce1e03d9960d4e3 03-Dec-2013 Lajos Molnar <lajos@google.com> media: add AdaptivePlaybackTest suite

Initial version of the test suite, with relaxed checks on PTS and number-
of-frames-decoded (only warnings) suitable for KitKat devices.

Bug: 13363930
Change-Id: I8b49dcc21be179e4392503e9f47d952d8cd64e6b
Signed-off-by: Lajos Molnar <lajos@google.com>
es/raw/video_1280x720_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp9_309kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
a6ea2481f93a3e703de11bb1f6c656827608cea3 09-Jan-2014 Brett Chabot <brettchabot@google.com> Move to android.support.test as CTS instrumentation runner.

Also do the following related cleanup
- Remove references to deprecated BrokenTest and KnownFailure
- Switch CTS tests to build against SDK and not private
android.test.runner where possible

Bug: 12924356

Change-Id: If6151b836456eec4838f8d7d6e11c9834c007fca
ndroid.mk
ndroidManifest.xml
f6cf6d8170dec19b2f8ad29165abf2da02bbbd9b 12-Mar-2014 Alex Glaznev <glaznev@google.com> Merge "Extend CTS VP8 encoder and decoder tests."
5374bc49badd8eedcbae59836b2829275b9f2f8f 11-Mar-2014 Lajos Molnar <lajos@google.com> am 5c1b04e4: Merge "EncodeDecodeTest: Test both VP8 and AVC"

* commit '5c1b04e49e91041396edc3c25e3ab52ee1af7239':
EncodeDecodeTest: Test both VP8 and AVC
8de996f4cb74f6850ff29a12655025c7c3f802af 11-Mar-2014 Marco Nelissen <marcone@google.com> am 7395b9ff: Merge "StreamingMediaPlayerTest: Add a test for redirects in HLS playlists"

* commit '7395b9ffa7b05e6db7bc7a9b64e49c025447af34':
StreamingMediaPlayerTest: Add a test for redirects in HLS playlists
2130150c1d2398a628341269c5e3776ecd49f59a 08-Mar-2014 Stuart Scott <stuartscott@google.com> am 317e726d: Merge "Use runtime lookup of config_useFixedVolume in AudioManager"

* commit '317e726d4bc92ecec5f8459bc10a3789fc750a0f':
Use runtime lookup of config_useFixedVolume in AudioManager
38db26307da6ad8e7b539037fed1559668154e68 28-Jan-2014 Alex Glaznev <glaznev@google.com> Extend CTS VP8 encoder and decoder tests.

Bug: 11990571

- Change basic test to encode video streams with a set of bitrates and
verify that actual bitrate values are close to the target.

- Add encoding and decoding quality statistics to the tests.

- Add video quality test, which will encode and decode video stream at
various bitrates, check PSNR, verifies that video streams with higher
bitrates have higher PSNR and compare PSNR values of platform
specific and reference SW video codecs.

- Add function to select platform specific VP8 codec.

- Add YUV420p->NV12 and NV12->YUV420p color space conversions.

- Add support for a few variants of NV12 color space to encoder input
and decoder output.

- Tested on N4 and N5 devices. Code currently supports
a few Qualcomm specific color space formats. This part may need
to be extended later for other devices if any non standard
color formats will be used.

- Some test results for N4 and N5 device:

a) PSNR values calculated for 9 seconds of football_qvga
QVGA 30 fps video:
300 kbps: SW codec PSNR: 33.1 dB. HW codec PSNR: 32.5 dB.
500 kbps: SW codec PSNR: 35.2 dB. HW codec PSNR: 34.9 dB.
700 kbps: SW codec PSNR: 36.6 dB. HW codec PSNR: 36.7 dB.
900 kbps: SW codec PSNR: 37.8 dB. HW codec PSNR: 38.0 dB.
b) Force key frame requests to the HW codec are working well giving
key frame interval value exactly as was requested. For SW
codec generated key frames may appear 2 frames after the request
was actually made.
c) Dynamic bitrate change is also working well for N5 device - the
transition to new bitrate is fast and generated bitrate after the
change request follows the target value close enough.
For SW codec dynamic bitrate change is not working well
(b/12908952) - actual bitrate value after the adjustment is
too different from the expected one.

Change-Id: I4930f0afe69912624d311dc772ed6b088a35da4c
es/raw/football_qvga.yuv
es/raw/football_qvga_desc.txt
rc/android/media/cts/Vp8EncoderTest.java
16b9861c921696c9ed61a77652ce39e344a39213 07-Mar-2014 Marco Nelissen <marcone@google.com> am 7143cde1: Merge "StreamingMediaPlayerTest: Add tests for HLS served locally"

* commit '7143cde177eb0b777881b0743cf80c4509994d80':
StreamingMediaPlayerTest: Add tests for HLS served locally
6b820ad39571bb4bcbbf8c2bb5f74e10ffdab37a 07-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am c2ebf9b7: am 954608a6: am cdb4914f: am 744a1bd3: am 39423cc3: am 14aea90a: am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit 'c2ebf9b725a3f9a76012f62bca5b3e5567484b68':
Use itag 137 rather than 37 for testing AvcHigh40
28e9505e2fb4af2907ff2337b52f1c5ba95174b0 07-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am e4869848: am 04ce50f1: am c2ebf9b7: am 954608a6: am cdb4914f: am 744a1bd3: am 39423cc3: am 14aea90a: am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit 'e486984853c89dfdd088da5b653cb7a1bb9f2547':
Use itag 137 rather than 37 for testing AvcHigh40
e486984853c89dfdd088da5b653cb7a1bb9f2547 07-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 04ce50f1: am c2ebf9b7: am 954608a6: am cdb4914f: am 744a1bd3: am 39423cc3: am 14aea90a: am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit '04ce50f1e81f11ea7bfaa1152f073ac8aca9f81b':
Use itag 137 rather than 37 for testing AvcHigh40
04ce50f1e81f11ea7bfaa1152f073ac8aca9f81b 07-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am c2ebf9b7: am 954608a6: am cdb4914f: am 744a1bd3: am 39423cc3: am 14aea90a: am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit 'c2ebf9b725a3f9a76012f62bca5b3e5567484b68':
Use itag 137 rather than 37 for testing AvcHigh40
954608a64c059ec1a76ea058059136bd7fb86887 07-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am cdb4914f: am 744a1bd3: am 39423cc3: am 14aea90a: am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit 'cdb4914fa0ed4ec927767ac0eceb60ed044b0cce':
Use itag 137 rather than 37 for testing AvcHigh40
cdb4914fa0ed4ec927767ac0eceb60ed044b0cce 07-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 744a1bd3: am 39423cc3: am 14aea90a: am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit '744a1bd37ddbbf9fb04b3d886e6b5caa2f706c34':
Use itag 137 rather than 37 for testing AvcHigh40
744a1bd37ddbbf9fb04b3d886e6b5caa2f706c34 07-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 39423cc3: am 14aea90a: am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit '39423cc340cb9dbe02e213f43efd63eb8ea4c755':
Use itag 137 rather than 37 for testing AvcHigh40
14aea90adaa3c3f49d4cba70bb7e11784fe02351 06-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 4e3ccdf5: am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit '4e3ccdf5e891fbed2c2b11c2467ed572a95ba4c8':
Use itag 137 rather than 37 for testing AvcHigh40
4e3ccdf5e891fbed2c2b11c2467ed572a95ba4c8 06-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 148fbbdd: am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit '148fbbdd4d2f06bafe8262682e90d14be52f571a':
Use itag 137 rather than 37 for testing AvcHigh40
148fbbdd4d2f06bafe8262682e90d14be52f571a 06-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 4ddaa1bd: am 44cfcac5: Use itag 137 rather than 37 for testing AvcHigh40

* commit '4ddaa1bdec05fa8f0f08eb19837880088f785de8':
Use itag 137 rather than 37 for testing AvcHigh40
44cfcac5a4147a3129089794d9d4796444740b78 06-Mar-2014 Bryan Mawhinney <bryanmawhinney@google.com> Use itag 137 rather than 37 for testing AvcHigh40

The format 37 streams have been taken down, resulting
in CTS test failures. However, 137 is fragmemented mp4,
which requires API level 18.

Bug: 12891411
Change-Id: If343b20cc919513305a7979986ffd85d984c636b
rc/android/media/cts/MediaCodecCapabilitiesTest.java
4d83439246ac67aff64a5102aaaa80fa39efd582 03-Mar-2014 Marco Nelissen <marcone@google.com> Merge "Test MediaPlayer.release() with blocked network"
a2a78bf1ecceed03cc39e43cd00fc58da4ca832a 28-Feb-2014 Marco Nelissen <marcone@google.com> Test MediaPlayer.release() with blocked network

Expand CtsTestServer to allow a request to be blocked for an arbitrary
amount of time, and add a test that checks that MediaPlayer.release()
returns quickly even when the MediaPlayer is blocked on the network.

b/13187722

Change-Id: I9c91826414600e8924789d55d484bbf6a347e6d3
rc/android/media/cts/StreamingMediaPlayerTest.java
3d4bfa9b04cb594165d8275e1181fde3db2262a1 28-Feb-2014 Lajos Molnar <lajos@google.com> am d3b405bd: am 5c1b04e4: Merge "EncodeDecodeTest: Test both VP8 and AVC"

* commit 'd3b405bd0d4801bcb360e28b0762b0e603995e8c':
EncodeDecodeTest: Test both VP8 and AVC
d3b405bd0d4801bcb360e28b0762b0e603995e8c 28-Feb-2014 Lajos Molnar <lajos@google.com> am 5c1b04e4: Merge "EncodeDecodeTest: Test both VP8 and AVC"

* commit '5c1b04e49e91041396edc3c25e3ab52ee1af7239':
EncodeDecodeTest: Test both VP8 and AVC
5c1b04e49e91041396edc3c25e3ab52ee1af7239 28-Feb-2014 Lajos Molnar <lajos@google.com> Merge "EncodeDecodeTest: Test both VP8 and AVC"
d450ff1e003311845a31ca3d5bb83072b19da94f 26-Feb-2014 Andy McFadden <fadden@android.com> Merge "Fix comment"
87d1a974a505e3850fff52890e4741f55fe9ad71 26-Feb-2014 Andy McFadden <fadden@android.com> Fix comment

Change-Id: Iac9114054d1881251af89f276e0015a4eecaa734
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
a2ebb1b77f9601c879b37bdf226fe2cbfb4c8b9b 24-Feb-2014 Marco Nelissen <marcone@google.com> am a016e710: am 7395b9ff: Merge "StreamingMediaPlayerTest: Add a test for redirects in HLS playlists"

* commit 'a016e71013607107134f43e753466c5b2fddf797':
StreamingMediaPlayerTest: Add a test for redirects in HLS playlists
a016e71013607107134f43e753466c5b2fddf797 24-Feb-2014 Marco Nelissen <marcone@google.com> am 7395b9ff: Merge "StreamingMediaPlayerTest: Add a test for redirects in HLS playlists"

* commit '7395b9ffa7b05e6db7bc7a9b64e49c025447af34':
StreamingMediaPlayerTest: Add a test for redirects in HLS playlists
7395b9ffa7b05e6db7bc7a9b64e49c025447af34 24-Feb-2014 Marco Nelissen <marcone@google.com> Merge "StreamingMediaPlayerTest: Add a test for redirects in HLS playlists"
24ebb3bc4e00f977008c344bbbafe6d76ca6a807 21-Feb-2014 Stuart Scott <stuartscott@google.com> am 40f8a0ee: am 317e726d: Merge "Use runtime lookup of config_useFixedVolume in AudioManager"

* commit '40f8a0eed9c4d42b3a17b310890097b320174e8a':
Use runtime lookup of config_useFixedVolume in AudioManager
40f8a0eed9c4d42b3a17b310890097b320174e8a 21-Feb-2014 Stuart Scott <stuartscott@google.com> am 317e726d: Merge "Use runtime lookup of config_useFixedVolume in AudioManager"

* commit '317e726d4bc92ecec5f8459bc10a3789fc750a0f':
Use runtime lookup of config_useFixedVolume in AudioManager
317e726d4bc92ecec5f8459bc10a3789fc750a0f 21-Feb-2014 Stuart Scott <stuartscott@google.com> Merge "Use runtime lookup of config_useFixedVolume in AudioManager"
16a8912946c70346c84be28d9f546938cf1fbd50 21-Feb-2014 Marco Nelissen <marcone@google.com> am e6b46655: am 7143cde1: Merge "StreamingMediaPlayerTest: Add tests for HLS served locally"

* commit 'e6b466554c8616b32cdbc06f8580890a57bcb233':
StreamingMediaPlayerTest: Add tests for HLS served locally
e6b466554c8616b32cdbc06f8580890a57bcb233 20-Feb-2014 Marco Nelissen <marcone@google.com> am 7143cde1: Merge "StreamingMediaPlayerTest: Add tests for HLS served locally"

* commit '7143cde177eb0b777881b0743cf80c4509994d80':
StreamingMediaPlayerTest: Add tests for HLS served locally
508197d283efcebaca034d97684735294a65799d 19-Feb-2014 Marco Nelissen <marcone@google.com> Expand fragmented mp4 test

The new test file
video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_dash.mp4
was created from the existing
video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4
with the command:
$ MP4Box -dash 1000 -rap \
video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4

Change-Id: I68421f8c7cf00112b0fe37863c3a3cfa3ada495d
es/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_dash.mp4
rc/android/media/cts/DecoderTest.java
8410ddd60b6b3a6bbf8633e1c91bc2a0ee992bb5 14-Feb-2014 Marco Nelissen <marcone@google.com> Add fragmented mp4 test

The new test file
video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_fragmented
was generated from the existing
video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz
with ffmpeg:
$ ffmpeg -re \
-i video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4 \
-f mp4 -movflags frag_keyframe+empty_moov -codec copy \
video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_fragmented.mp4
and contains the same data, just fragmented. It has no sidx box, since ffmpeg
does not appear to be capable of generating those.

Change-Id: I81ed29241e6ef91dd574447182e04c6b359b3e8a
es/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz_fragmented.mp4
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaPlayerTest.java
ac9581de6ae298de71966f1cee21faf82c71154d 18-Feb-2014 Lajos Molnar <lajos@google.com> Merge "media: add AdaptivePlaybackTest suite"
3de53831845f3336fa9e1cd133105670abf34bcd 14-Feb-2014 Andreas Huber <andih@google.com> Verify that MediaPlayer correctly plays mp3 audio file encoded as

a data: URI.

Change-Id: I24146cb0026c6835c938def8d0f2ded8bbd705c4
es/raw/testmp3_3.raw
rc/android/media/cts/MediaPlayerTest.java
dac2ee886ac89ad34bf4f1539c63e681c33e234a 03-Dec-2013 Lajos Molnar <lajos@google.com> media: add AdaptivePlaybackTest suite

Initial version of the test suite, with relaxed checks on PTS and number-
of-frames-decoded (only warnings) suitable for KitKat devices.

Change-Id: I8b49dcc21be179e4392503e9f47d952d8cd64e6b
Signed-off-by: Lajos Molnar <lajos@google.com>
es/raw/video_1280x720_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_1280x720_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_1280x720_webm_vp9_309kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
rc/android/media/cts/AdaptivePlaybackTest.java
5c5946f88777a0ad185e2c429a2114ab00f24343 13-Feb-2014 Martin Storsjo <martin@martin.st> EncodeDecodeTest: Test both VP8 and AVC

Since 4.3, VP8 encoding is supposed to be supported (either
with the fallback SW codec, or with a HW codec) according
to [1] - thus add a CTS test to make sure this actually is
working.

[1] http://developer.android.com/guide/appendix/media-formats.html

Change-Id: If41086ef5fc6731c8962e36f78e06dcb743436f3
rc/android/media/cts/EncodeDecodeTest.java
f186165ff2cd900874375595b10ca9f9ee53b414 11-Feb-2014 Martin Storsjo <martin@martin.st> StreamingMediaPlayerTest: Add a test for redirects in HLS playlists

Change-Id: Id4eea05b34bc11649336c7765bce7de94e583aa0
rc/android/media/cts/StreamingMediaPlayerTest.java
ad8a5fc97277aacf40fb8d05be8e670cdf933f7b 11-Feb-2014 Martin Storsjo <martin@martin.st> StreamingMediaPlayerTest: Add tests for HLS served locally

Also add a test to make sure query strings are handled properly
when interpreting relative URLs, as fixed in frameworks/av
by 8883a38a308.

Change-Id: Ic00d58fcef9ed8acb60d426f1453e7f7bab1f455
ssets/hls.m3u8
ssets/segment000000.ts
ssets/segment000001.ts
rc/android/media/cts/StreamingMediaPlayerTest.java
90668433c4b044b2a49c87e0a3cdb7363ebe4cec 08-Feb-2014 Marco Nelissen <marcone@google.com> Test that codecs can be reused after EOS

b/12931287

Change-Id: I60c3da5a758f3ee7cd8b2a09470449652a90deaa
rc/android/media/cts/DecoderTest.java
a26b06d9d2779bda6b54a3aa1bc9a0deee1f1659 05-Feb-2014 Marco Nelissen <marcone@google.com> Test for MediaPlayer restart after completion

b/12890850

Change-Id: Iee3183936fcb04ee1b4b9d2a02b469cf4782eab2
rc/android/media/cts/MediaPlayerTest.java
9ab46af78ef14d9eed1a297842e93a36c3172740 19-Jun-2013 Bryan Mawhinney <bryanmawhinney@google.com> DO NOT MERGE
Cherry picked from https://googleplex-android-review.googlesource.com/322614

Replace deprecated YouTube streamer urls

Bug: 7688709
Change-Id: I33251dc173d7acc4a6d111c704d8a6464d0040c8

modified: tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
02c8f4875afe85f24d4c39deaa5444fb24f4eac6 24-Jan-2014 Glenn Kasten <gkasten@google.com> Merge "Add test for android.media.AudioTrack.setVolume(float)"
ec81bb5db6e5c946848c73ec0e5160537ffe8efc 22-Jan-2014 Andy Hung <hunga@google.com> Merge "Handle IOException from MediaCodec factory methods"
37325af2d3eb0990d249eb7b6618f4a897ca94d8 17-Jan-2014 Marco Nelissen <marcone@google.com> am 9c967e6c: am 1677b409: Merge "Create new ID3v2 metadata test, take 2"

* commit '9c967e6cc11763babea5056826483d781fbc3a2b':
Create new ID3v2 metadata test, take 2
9c967e6cc11763babea5056826483d781fbc3a2b 17-Jan-2014 Marco Nelissen <marcone@google.com> am 1677b409: Merge "Create new ID3v2 metadata test, take 2"

* commit '1677b409fb7562543499c3e3be29227801e296df':
Create new ID3v2 metadata test, take 2
b9b3dc24d89884633a05e34f5691c54f43f24614 17-Jan-2014 Marco Nelissen <marcone@google.com> am 4207358d: am 3dd9bf1d: Merge "Revert "Create new ID3v2 metadata test""

* commit '4207358dba49c6f14de2a90cf133b3f08b204460':
Revert "Create new ID3v2 metadata test"
86c9d7b587fd9ac12c69ec2d9328c2b23fe7c5a8 17-Jan-2014 Marco Nelissen <marcone@google.com> am da9a2a31: am 0110f4ff: Merge "Create new ID3v2 metadata test"

* commit 'da9a2a3162da82b84b9d75243dbe2607b543fc38':
Create new ID3v2 metadata test
4207358dba49c6f14de2a90cf133b3f08b204460 17-Jan-2014 Marco Nelissen <marcone@google.com> am 3dd9bf1d: Merge "Revert "Create new ID3v2 metadata test""

* commit '3dd9bf1d012eb450641f8c1a4ba04ebc394ac0ec':
Revert "Create new ID3v2 metadata test"
da9a2a3162da82b84b9d75243dbe2607b543fc38 17-Jan-2014 Marco Nelissen <marcone@google.com> am 0110f4ff: Merge "Create new ID3v2 metadata test"

* commit '0110f4ff73bab7e35ba7c07c56975dbd7765923c':
Create new ID3v2 metadata test
fad4333d2c696dc3aee6af33c2021ea557339532 17-Jan-2014 Marco Nelissen <marcone@google.com> Create new ID3v2 metadata test, take 2

Add a new test to verify that ID3v2 metadata in mp4 files can be extracted.

Change-Id: I73f87f8ecdc643482b76d73532e67766b5576731
es/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2.mp4
rc/android/media/cts/MediaMetadataRetrieverTest.java
26229c121f77b4812df314664fa6a436b2efc3c4 17-Jan-2014 Marco Nelissen <marcone@google.com> Revert "Create new ID3v2 metadata test"

This reverts commit dd7a0e58f527b160ecf61a19556d4a921840ed28.

Change-Id: I9dc3675769c4589c0f3b05f6d012054554381da8
es/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2.mp4
rc/android/media/cts/MediaMetadataRetrieverTest.java
996443d38c97df03853a4e9148ccf9bfc1ff7bb8 04-Nov-2013 Andy Hung <hunga@google.com> Handle IOException from MediaCodec factory methods

Bug: 11364276
Change-Id: I0013d88a4ce5c409bb0ecfd8bd7e7e4ff9e54fe1
Signed-off-by: Andy Hung <hunga@google.com>
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncoderTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaCodecTest.java
dd7a0e58f527b160ecf61a19556d4a921840ed28 30-Dec-2013 Oscar Rydhé <oscar.rydhe@sonymobile.com> Create new ID3v2 metadata test

Added a new test to verify that ID3v2 metadata in mp4 files
can be extracted.

Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
es/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz_id3v2.mp4
rc/android/media/cts/MediaMetadataRetrieverTest.java
600cd31162c28ff24c965a2e63a5725f131a98e0 15-Jan-2014 Marco Nelissen <marcone@google.com> am 1636d646: am a4d259dd: Merge "Add a test for setDataSource(null)"

* commit '1636d64646e8bc5146a2f813deb11a0f7624666e':
Add a test for setDataSource(null)
1636d64646e8bc5146a2f813deb11a0f7624666e 15-Jan-2014 Marco Nelissen <marcone@google.com> am a4d259dd: Merge "Add a test for setDataSource(null)"

* commit 'a4d259dd3b16f51617d3df5ea17dc8b2a37d7580':
Add a test for setDataSource(null)
1c56173e8859ba926823715d15d58ae0e4f7be10 14-Jan-2014 Glenn Kasten <gkasten@google.com> Add test for android.media.AudioTrack.setVolume(float)

Bug: 12534920
Change-Id: Ic314d7f79fc7228c32bb0c4eeee58ab68605c715
rc/android/media/cts/AudioTrackTest.java
8bf0d78a9da95d6a0a90968ac4e79e7cb869a580 13-Jan-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 3592d77f: am fcaee8c5: am 10070d47: am 05787e0c: am ffe9978a: am 344fe757: am 9dd3e2c2: Basic test of MediaCodecInfo.CodecCapabilities

* commit '3592d77f5d116ffe329a6912835a01912aafbaa9':
Basic test of MediaCodecInfo.CodecCapabilities
3592d77f5d116ffe329a6912835a01912aafbaa9 13-Jan-2014 Bryan Mawhinney <bryanmawhinney@google.com> am fcaee8c5: am 10070d47: am 05787e0c: am ffe9978a: am 344fe757: am 9dd3e2c2: Basic test of MediaCodecInfo.CodecCapabilities

* commit 'fcaee8c51cd194badae8f510fe3d1fff26e9f838':
Basic test of MediaCodecInfo.CodecCapabilities
05787e0c1b774dafdb04ef50d39d2f4a8709518f 13-Jan-2014 Bryan Mawhinney <bryanmawhinney@google.com> am ffe9978a: am 344fe757: am 9dd3e2c2: Basic test of MediaCodecInfo.CodecCapabilities

* commit 'ffe9978acc6261a9c411d156f9d9407d4fc12435':
Basic test of MediaCodecInfo.CodecCapabilities
ffe9978acc6261a9c411d156f9d9407d4fc12435 13-Jan-2014 Bryan Mawhinney <bryanmawhinney@google.com> am 344fe757: am 9dd3e2c2: Basic test of MediaCodecInfo.CodecCapabilities

* commit '344fe7578c20971a034cb7ea7f88ead7e39571dc':
Basic test of MediaCodecInfo.CodecCapabilities
9dd3e2c238f94e7113947094d2b841516a1cb994 11-Oct-2013 Bryan Mawhinney <bryanmawhinney@google.com> Basic test of MediaCodecInfo.CodecCapabilities

Verifies that the device can play a few of the video formats
reported by MediaCodecInfo.CodecCapabilities

Bug: 10071083
Change-Id: I76589fa2ebd90800907348c8dbb0bc189e45226c
(cherry picked from commit 307efe6b574fc2ba3a048150463488887f094027)
rc/android/media/cts/MediaCodecCapabilitiesTest.java
79de1e3af00cf260e81d31a4175c84e60571318c 09-Jan-2014 Oscar Rydhé <oscar.rydhe@sonymobile.com> Add a test for setDataSource(null)

This is a test for "Fix NullpointerException in MediaMetadataRetriever"
with id 425916e in MediaMetadataRetriever

Change-Id: Iff0bda5e035893824525b9f4ec9c023cef13c898
rc/android/media/cts/MediaMetadataRetrieverTest.java
b4169344245631de774e3957a2bacf27c2cb928c 02-Jan-2014 Oscar Rydhé <oscar.rydhe@sonymobile.com> Use runtime lookup of config_useFixedVolume in AudioManager

In the current code the config setting config_useFixedVolume was
transformed into the resource id at compile time. This cause errors
in the tests if this resource id was not used for the same config
setting in the device under test. This is solved by looking up
the resource id during runtime instead.

Change-Id: I5fed34af745b92ec88b527c853eb4996f8ed6115
rc/android/media/cts/AudioManagerTest.java
efcb4c268a402743367b93841739f2cc8b754141 07-Jan-2014 Robert Shih <robertshih@google.com> Merge "Take BufferInfo.offset into account when reading output ByteBuffers from MediaCodec."
24b9cf0099985566f2332eec47e3d9c1d1719a1c 18-Dec-2013 Unsuk Jung <unsuk@google.com> am 23ff7a0e: am bd99b8a2: am b718fd90: am faea72b4: am 83710c5a: am a7d3e174: am 4aec9501: am 1b11a123: am 2cc9d8ad: am 79ac1323: am 29264208: Modify testHLS URL to refer v2 server stream

* commit '23ff7a0ede35871f259578ff3239c31c9c3b3661':
Modify testHLS URL to refer v2 server stream
23ff7a0ede35871f259578ff3239c31c9c3b3661 18-Dec-2013 Unsuk Jung <unsuk@google.com> am bd99b8a2: am b718fd90: am faea72b4: am 83710c5a: am a7d3e174: am 4aec9501: am 1b11a123: am 2cc9d8ad: am 79ac1323: am 29264208: Modify testHLS URL to refer v2 server stream

* commit 'bd99b8a2bd9fa54f4552c1326c782d7f96e19ac8':
Modify testHLS URL to refer v2 server stream
b718fd90e5519e05a7efc27239fce6a0923b1974 18-Dec-2013 Unsuk Jung <unsuk@google.com> am faea72b4: am 83710c5a: am a7d3e174: am 4aec9501: am 1b11a123: am 2cc9d8ad: am 79ac1323: am 29264208: Modify testHLS URL to refer v2 server stream

* commit 'faea72b4b5053fb0fff872a7142b919b0e4b374b':
Modify testHLS URL to refer v2 server stream
faea72b4b5053fb0fff872a7142b919b0e4b374b 18-Dec-2013 Unsuk Jung <unsuk@google.com> am 83710c5a: am a7d3e174: am 4aec9501: am 1b11a123: am 2cc9d8ad: am 79ac1323: am 29264208: Modify testHLS URL to refer v2 server stream

* commit '83710c5a45289ad19d54b5a29713853ab9b5a3e8':
Modify testHLS URL to refer v2 server stream
83710c5a45289ad19d54b5a29713853ab9b5a3e8 18-Dec-2013 Unsuk Jung <unsuk@google.com> am a7d3e174: am 4aec9501: am 1b11a123: am 2cc9d8ad: am 79ac1323: am 29264208: Modify testHLS URL to refer v2 server stream

* commit 'a7d3e174547b83a3492745a02b5b8791a26aeb44':
Modify testHLS URL to refer v2 server stream
1b11a123abc52b49d6a6400659ff1c1f3bed0069 18-Dec-2013 Unsuk Jung <unsuk@google.com> am 2cc9d8ad: am 79ac1323: am 29264208: Modify testHLS URL to refer v2 server stream

* commit '2cc9d8ad465d137de4485f7c6f71d902be0bec65':
Modify testHLS URL to refer v2 server stream
2cc9d8ad465d137de4485f7c6f71d902be0bec65 18-Dec-2013 Unsuk Jung <unsuk@google.com> am 79ac1323: am 29264208: Modify testHLS URL to refer v2 server stream

* commit '79ac1323ce71309d8ca7c2d8466b9bb344696b97':
Modify testHLS URL to refer v2 server stream
29264208d0032b3191716b7719d8b2566fbbe4da 18-Dec-2013 Unsuk Jung <unsuk@google.com> Modify testHLS URL to refer v2 server stream

Bug: 11976053
Change-Id: If7854083399619ffea3119ff9e0320c279e9038f
rc/android/media/cts/StreamingMediaPlayerTest.java
ab8d96e209ee57925f65c42b7a0c17a2750adfb1 16-Dec-2013 Robert Shih <robertshih@google.com> Take BufferInfo.offset into account when reading output ByteBuffers
from MediaCodec.

Bug: 10070507
Change-Id: I2febe94b880149c492a93461ee9924a67370d14b
Signed-off-by: Robert Shih <robertshih@google.com>
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/Vp8EncoderTest.java
b2bc22a48764ea265f2c3e8b917f0761e08990bf 13-Dec-2013 Brian Carlstrom <bdc@google.com> Revert "Test starting and releasing two MediaCodecs."

This reverts commit 2dd939d187a638482de8fcbee048c7eb3b83ea46.
rc/android/media/cts/MediaCodecTest.java
2dd939d187a638482de8fcbee048c7eb3b83ea46 06-Nov-2013 Andrew Lewis <andrewlewis@google.com> Test starting and releasing two MediaCodecs.

Add CTS tests that check that it is possible to (1) create two audio decoders
at the same time, and (2) create an audio encoder and decoder at the same time,
and release them.

Bug: 11288444
Change-Id: I86c47c3d6bca44838d77a8d49dcfb46510476b14
rc/android/media/cts/MediaCodecTest.java
f0dce7821ac8cf48883cb30fe974671f8fa8b734 12-Dec-2013 Marco Nelissen <marcone@google.com> Test proper detection of character set encodings

b/5564857

Change-Id: Id231f1d3e59fb2d8a05d2fff95ea1e050b6f68a9
es/raw/big5_1.mp3
es/raw/big5_2.mp3
es/raw/cp1251_3.mp3
es/raw/cp1251_4.mp3
es/raw/cp1251_5.mp3
es/raw/cp1251_6.mp3
es/raw/cp1251_v1.mp3
es/raw/cp1251_v1v2.mp3
es/raw/gb18030_1.mp3
es/raw/gb18030_2.mp3
es/raw/gb18030_3.mp3
es/raw/gb18030_4.mp3
es/raw/gb18030_5.mp3
es/raw/gb18030_6.mp3
es/raw/gb18030_7.mp3
es/raw/gb18030_8.mp3
es/raw/hebrew.mp3
es/raw/hebrew2.mp3
es/raw/iso88591_1.ogg
es/raw/shiftjis1.mp3
es/raw/shiftjis2.mp3
es/raw/shiftjis3.mp3
es/raw/shiftjis4.mp3
es/raw/shiftjis5.mp3
es/raw/shiftjis6.mp3
es/raw/shiftjis7.mp3
es/raw/shiftjis8.mp3
rc/android/media/cts/MediaScannerTest.java
febce8e18d5181cd4ec5d1071c62968c48b9a56d 12-Dec-2013 Chad Jones <chadj@google.com> am 6400db1d: am a0bb4f05: am 10364c81: Merge "Test starting and releasing two MediaCodecs." into klp-dev

* commit '6400db1ddc5bfc2a76eeb8eec3c381aade0b9c61':
Test starting and releasing two MediaCodecs.
6400db1ddc5bfc2a76eeb8eec3c381aade0b9c61 12-Dec-2013 Andrew Lewis <andrewlewis@google.com> am a0bb4f05: am 10364c81: Merge "Test starting and releasing two MediaCodecs." into klp-dev

* commit 'a0bb4f05b2e9a90446d5ed149f5da73b15759c4b':
Test starting and releasing two MediaCodecs.
10364c81b3e4971e7bf584ac32405ccb4a7bbe42 12-Dec-2013 Andrew Lewis <andrewlewis@google.com> Merge "Test starting and releasing two MediaCodecs." into klp-dev
27bc3d7a8449767a5d5ce647ecb85f6bac56c9c9 11-Dec-2013 Andrew Lewis <andrewlewis@google.com> am d097cf66: am 4b339016: am 3d2556a9: Merge "Test decoding a short video stream." into klp-dev

* commit 'd097cf6602a5b567f543cf4c54a0d4f0d322c32b':
Test decoding a short video stream.
d097cf6602a5b567f543cf4c54a0d4f0d322c32b 11-Dec-2013 Andrew Lewis <andrewlewis@google.com> am 4b339016: am 3d2556a9: Merge "Test decoding a short video stream." into klp-dev

* commit '4b33901682577fe1a8e280c4caf80971026d0930':
Test decoding a short video stream.
3d2556a90280fcb51c8f668f1ab43e4652ab0d81 11-Dec-2013 Andrew Lewis <andrewlewis@google.com> Merge "Test decoding a short video stream." into klp-dev
ad29e3016adca9788865054d38badc571c2c6959 06-Nov-2013 Andrew Lewis <andrewlewis@google.com> Test starting and releasing two MediaCodecs.

Add CTS tests that check that it is possible to (1) create two audio decoders
at the same time, and (2) create an audio encoder and decoder at the same time,
and release them.

Bug: 11288444
Change-Id: I86c47c3d6bca44838d77a8d49dcfb46510476b14
rc/android/media/cts/MediaCodecTest.java
757ed8e2b3ccc5e5534688002320e06882e00195 06-Dec-2013 Andy Hung <hunga@google.com> Merge "Improve CTS DecoderTest CRC checks"
116efb712782f7f39c54a0573cd1456c6b50e6a1 16-Nov-2013 Andy Hung <hunga@google.com> Improve CTS DecoderTest CRC checks

CRC:
1) increase CRC checksum speed (~80x) by using temporary line buffer
2) add new CRC function with width, height, stride for YUV formatted
data (tested but not used yet).

Related:
1) Improve speed of EOS test by computing reference sequence only once.
2) Combine decode functionality for additional tests without sacrificing speed.

Change-Id: Ibdb4f0bd057ad7a163738789b791f19bfe87a2af
Signed-off-by: Andy Hung <hunga@google.com>
Bug: 11716405
rc/android/media/cts/DecoderTest.java
dd1a68b52e6e1ab5932947b51895514c1a978bb2 06-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'f5e904da465c2fb401e360eeb275117ea9a374ab' into HEAD
d465cb401c4924e6a683591652b04ca8630bce7d 03-Dec-2013 Marco Nelissen <marcone@google.com> am 2b86250d: am 0d4f85b4: Merge "Added support for 3GPP meta data atoms"

* commit '2b86250d640fb8aeb03520e54839a6198cd5ad87':
Added support for 3GPP meta data atoms
2b86250d640fb8aeb03520e54839a6198cd5ad87 28-Nov-2013 Marco Nelissen <marcone@google.com> am 0d4f85b4: Merge "Added support for 3GPP meta data atoms"

* commit '0d4f85b437d595486f7155692865fdb00ebc1c86':
Added support for 3GPP meta data atoms
0d4f85b437d595486f7155692865fdb00ebc1c86 28-Nov-2013 Marco Nelissen <marcone@google.com> Merge "Added support for 3GPP meta data atoms"
54fd618942af4a206eeb7bbd13b3c93a5b7b83ea 27-Nov-2013 Robert Shih <robertshih@google.com> Merge "Test if configuring a MediaCodec object w/ `configure` or queueing csd-0 data w/ `queueInputBuffer` and the BUFFER_FLAG_CODEC_CONFIG flag yield identical results."
3aa5b48315260a80c2ae20872b76fb96935cbb8e 19-Nov-2013 Robert Shih <robertshih@google.com> Test if configuring a MediaCodec object w/ `configure` or queueing csd-0 data
w/ `queueInputBuffer` and the BUFFER_FLAG_CODEC_CONFIG flag yield identical
results.

Bug: 11756501
Change-Id: Ice474ac6ec27095ac8ffa20440c9f0b64f837ebc
rc/android/media/cts/DecoderTest.java
96b90f690fd93b690f1b1160e5c07877214fee5e 06-Nov-2013 Andrew Lewis <andrewlewis@google.com> Test decoding a short video stream.

Add CTS test that decodes one of the H.264/AVC resource videos but truncates
the stream by signaling end-of-stream shortly after the start of the input. In
this situation the decoder should output decoded frames up to the end of stream
(assuming the input bitstream to the truncation point is complete).

Bug: 11433909
Change-Id: I4de055d698a4af517d0dbbe81ff10724186ea515
rc/android/media/cts/MediaCodecTest.java
3e76281ee96a445b79a7ebded00c95b8e0909aa5 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'd014c98e0f3d61cbaaa55eca40eed3e893582278' into HEAD

Change-Id: I3e0b18eeb6afd2db539e24e86bf92279392b07b7
0ade8f906ff658b446dc4ee8e465c40cb1723f50 22-Nov-2013 Marco Nelissen <marcone@google.com> am ff8b191f: am a29f645f: am 2ab90d36: Merge "Fix for failing test of testEOS because checksum takes too long"

* commit 'ff8b191fad2445137f21a046d7b095fc2592835a':
Fix for failing test of testEOS because checksum takes too long
ff8b191fad2445137f21a046d7b095fc2592835a 22-Nov-2013 Marco Nelissen <marcone@google.com> am a29f645f: am 2ab90d36: Merge "Fix for failing test of testEOS because checksum takes too long"

* commit 'a29f645f3564df2a224b33eaccd036b800c864e7':
Fix for failing test of testEOS because checksum takes too long
341a72a6bfe38c1a1c87aba0168b87ef4405bdd5 18-Nov-2013 Marco Nelissen <marcone@google.com> Test for AAC decoder misbehavior

AAC decoder would crash if no data was ever submitted.
b/11696552

Change-Id: Ia9d2705b42ab4c0b15f65f632f6bb0d095e06731
rc/android/media/cts/DecoderTest.java
923bb77624d140dcf49c0eedf0c2226458e8cdd4 19-Nov-2013 Ryszard Grzesica <ryszard.grzesica@sonymobile.com> Fix for failing test of testEOS because checksum takes too long

While low latency port reconfiguration is on (the same as smooth
streaming but for local playback) allocated buffers has maximum
supported capacity in our case it is Full HD.
Effective buffer size is equal to HxWx3/2 but in this test capacity
was used for checksum check. So instead of check of buffer ~300k
test was checking buffer of ~3M size what makes the test to take
too long and test failed due to timeout.

In test used space of the buffer should be used.

Change-Id: Ie4854eef1d26737bfeade298ebb80f91891c8b6d
rc/android/media/cts/DecoderTest.java
12e5556096207c0aa9c892ad3ed310bdb030c7b3 08-Nov-2013 Andy McFadden <fadden@android.com> Add "abrupt stop" test

The test throws a bunch of buffers at the codec, and then stops
abruptly. We want to make sure the stop() method doesn't hang.

Bug 11596627

Change-Id: I172f1857572fac205749f86dcb8184b8f49fa4a4
rc/android/media/cts/MediaCodecTest.java
0567d8f68024925a9134d27da534799eb1eddc8d 09-Nov-2013 Stuart Scott <stuartscott@google.com> resolved conflicts for merge of eee6081f to master

Change-Id: I822bd11e574c2eb7a61c6238322d70f15cca7301
eee6081fc280e662a0ce9e32651c4e7635414f80 09-Nov-2013 Stuart Scott <stuartscott@google.com> am 823161c9: am 16be4106: Merge "Refactoring CTS to remove PTS references." into klp-dev

* commit '823161c92250a4aad687a488c4f63e4704d02660':
Refactoring CTS to remove PTS references.
a132af6f95074f34298384b7b217afc42d76b30b 07-Nov-2013 Stuart Scott <stuartscott@google.com> Refactoring CTS to remove PTS references.

PTS is now a part of CTS

bug: 11561456
Change-Id: I577296fe7735790e285aa4747dc7832bc8ae5b6d
ndroid.mk
86fc7aa1fb668af07a959d4fef08b16bdac445fe 07-Nov-2013 Andy Hung <hunga@google.com> Revert "Add "throws IOException" to MediaCodec constructors"

This reverts commit bc56779be9149b02574f097a0ae06d0d19f11f3e.

Change-Id: Id1a6949f7206955bb93e0c92fcf7699fadb38b93
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncoderTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaCodecTest.java
bc56779be9149b02574f097a0ae06d0d19f11f3e 04-Nov-2013 Andy Hung <hunga@google.com> Add "throws IOException" to MediaCodec constructors

Change to add "throws IOException" to android.media.MediaCodec
(createByCodecName|createDecoderByType|createEncoderByType). The exception was
previously thrown through the native JNI, but not explicitly declared.

Requires changes to existing code for declaration compatibility.

Bug: 11364276
Change-Id: Ide4231c75a135e5e16d3b4787a9f05d35135cdcd
Signed-off-by: Andy Hung <hunga@google.com>
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
rc/android/media/cts/EncoderTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaCodecTest.java
cc6cc51bece090e9c514611b95ffc85b5781c45b 21-Oct-2013 Glenn Kasten <gkasten@google.com> am ef3db004: am b67b7ca1: am 4d66799f: Merge "Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay" into klp-dev

* commit 'ef3db004d6eaca7edbabe4eebdb5add4e2597e71':
Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay
ef3db004d6eaca7edbabe4eebdb5add4e2597e71 21-Oct-2013 Glenn Kasten <gkasten@google.com> am b67b7ca1: am 4d66799f: Merge "Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay" into klp-dev

* commit 'b67b7ca1b074b8233ec55806c41c98321a77ce70':
Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay
ea60bad3fbbc044e74c21659b4208f319972fbe5 19-Oct-2013 Glenn Kasten <gkasten@google.com> Fix CTS failure on testPlaybackHeadPositionAfterFlushAndPlay

Bug: 11277819
Change-Id: Ia882d8627fbae208d8bf573a5fde9a92629dbc3c
rc/android/media/cts/AudioTrackTest.java
013fce5a1fe90487c58275b75731068250d30a77 17-Oct-2013 Stuart Scott <stuartscott@google.com> am 08e11988: am 3f18112d: am 55256961: Merge "Test VP8 behavior with VIDEO_BITRATE" into klp-dev

* commit '08e11988aadd80df2967e2cab48f934f836c30c9':
Test VP8 behavior with VIDEO_BITRATE
08e11988aadd80df2967e2cab48f934f836c30c9 17-Oct-2013 Stuart Scott <stuartscott@google.com> am 3f18112d: am 55256961: Merge "Test VP8 behavior with VIDEO_BITRATE" into klp-dev

* commit '3f18112d361e75bb802766aabc67e923ceda3697':
Test VP8 behavior with VIDEO_BITRATE
5525696144610abf35d1265948f66c0b30d47cfc 17-Oct-2013 Stuart Scott <stuartscott@google.com> Merge "Test VP8 behavior with VIDEO_BITRATE" into klp-dev
bc7d85ffd5ef3dbc792d1f6cac0f83328c988180 11-Oct-2013 Bryan Mawhinney <bryanmawhinney@google.com> am a06f8156: am 4cb54cd0: am 02519dac: Merge "Basic test of MediaCodecInfo.CodecCapabilities" into klp-dev

* commit 'a06f8156cdfc481f5fcc848043f72ab7a8d7b58c':
Basic test of MediaCodecInfo.CodecCapabilities
a06f8156cdfc481f5fcc848043f72ab7a8d7b58c 11-Oct-2013 Bryan Mawhinney <bryanmawhinney@google.com> am 4cb54cd0: am 02519dac: Merge "Basic test of MediaCodecInfo.CodecCapabilities" into klp-dev

* commit '4cb54cd0607c9b82808a4c4b01a790be300453cc':
Basic test of MediaCodecInfo.CodecCapabilities
307efe6b574fc2ba3a048150463488887f094027 11-Oct-2013 Bryan Mawhinney <bryanmawhinney@google.com> Basic test of MediaCodecInfo.CodecCapabilities

Verifies that the device can play a few of the video formats
reported by MediaCodecInfo.CodecCapabilities

Bug: 10071083
Change-Id: I76589fa2ebd90800907348c8dbb0bc189e45226c
rc/android/media/cts/MediaCodecCapabilitiesTest.java
ae94e8f623c69809eed448f17019e8d0b1bc25d9 04-Oct-2013 keunyoung <keunyoung@google.com> am 7336431c: am 93fac281: am 9736ec0f: fix sending EOS after Surface is released.

* commit '7336431c9a65ecc7302b4dda62b23c1079705026':
fix sending EOS after Surface is released.
7336431c9a65ecc7302b4dda62b23c1079705026 04-Oct-2013 keunyoung <keunyoung@google.com> am 93fac281: am 9736ec0f: fix sending EOS after Surface is released.

* commit '93fac2815dec68fdc53026975748b02da57cc02f':
fix sending EOS after Surface is released.
9736ec0f4f02f1215141d8997fc54e3de31e1da6 04-Oct-2013 keunyoung <keunyoung@google.com> fix sending EOS after Surface is released.

- EOS can fail as there is no backing buffer

bug: 11070246
Change-Id: I751bba776250c9445016b9ac009134f9079e37ac
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
0be06162cb2e8270e78b32a255d4401ef0b643d6 04-Oct-2013 Andy McFadden <fadden@android.com> am 60adac8b: am 5eb426c8: am 4b8c68a8: Merge "Go faster by wasting CPU" into klp-dev

* commit '60adac8b8248f0883eae4d2d4efb4c00e61e0beb':
Go faster by wasting CPU
60adac8b8248f0883eae4d2d4efb4c00e61e0beb 04-Oct-2013 Andy McFadden <fadden@android.com> am 5eb426c8: am 4b8c68a8: Merge "Go faster by wasting CPU" into klp-dev

* commit '5eb426c8e3cfb1d076e49f5cd974cde5f46d9ed2':
Go faster by wasting CPU
4b8c68a84f0c57e6ff1fc973d69ff8dadbb0882b 03-Oct-2013 Andy McFadden <fadden@android.com> Merge "Go faster by wasting CPU" into klp-dev
c67c83a0c1584bdf838bfa1d01eff31ff679d594 03-Oct-2013 Andy McFadden <fadden@android.com> Go faster by wasting CPU

Part of this test generates frames faster than SurfaceFlinger can
display them, to test SF's ability to drop stale timestamped
buffers. On certain devices, the power management reduces the
clock frequencies to the point where we can't actually generate
frames that quickly.

This adds a spinning thread on multi-core devices to increase the
apparent workload.

Bug 10955012

Change-Id: Ic07c93765a41e150449fdce61f4fc4f3785451d0
rc/android/media/cts/PresentationSyncTest.java
9428e4cdd03cdfa5b5ecb7acad94af94b166e49f 02-Oct-2013 Unsuk Jung <unsuk@google.com> am 1591a9ce: am 48cb70be: Merge changes Ifdb3aae8,Iab0f3ea9 into klp-dev

* commit '1591a9ce615db4d98bb8668c3a71aea16c9878b9':
Test VP8 behavior with REQUEST_SYNC_FRAME
Verify that the first frame is a sync frame
1591a9ce615db4d98bb8668c3a71aea16c9878b9 02-Oct-2013 Unsuk Jung <unsuk@google.com> am 48cb70be: Merge changes Ifdb3aae8,Iab0f3ea9 into klp-dev

* commit '48cb70bef5ed7a34dfeb66f8f7b5a8a7cbbe3b40':
Test VP8 behavior with REQUEST_SYNC_FRAME
Verify that the first frame is a sync frame
45cf32ec9344eaa6eca7e5274d60ee4d3309de6d 02-Oct-2013 Andy McFadden <fadden@android.com> am 5ba75a8c: am dea78fa0: Merge "Suppress test differently" into klp-dev

* commit '5ba75a8cff688265e8c830c935290b4c8b586c23':
Suppress test differently
48cb70bef5ed7a34dfeb66f8f7b5a8a7cbbe3b40 02-Oct-2013 Unsuk Jung <unsuk@google.com> Merge changes Ifdb3aae8,Iab0f3ea9 into klp-dev

* changes:
Test VP8 behavior with REQUEST_SYNC_FRAME
Verify that the first frame is a sync frame
330693162f321c4b16d5a31238e8cd1379f49bb9 28-Sep-2013 Johann <johannkoenig@google.com> Test VP8 behavior with VIDEO_BITRATE

During the encode process, request several different bitrates. Compare
the sizes of the resulting frames to ensure that the bitrate does
change.

Bug: 8422347
Change-Id: If4969ea8bf03b336bc3bb4333887b64781520cb9
rc/android/media/cts/Vp8EncoderTest.java
8797a6e061b264906f36f0f5f5d71f518cd25949 27-Sep-2013 Johann <johannkoenig@google.com> Test VP8 behavior with REQUEST_SYNC_FRAME

During the encode process, request a sync frame. After the request,
make sure a sync frame shows up in the stream.

Bug: 8422347
Change-Id: Ifdb3aae875b5b97a9588aa3c202b4c2e2c02d517
rc/android/media/cts/Vp8EncoderTest.java
5ba75a8cff688265e8c830c935290b4c8b586c23 01-Oct-2013 Andy McFadden <fadden@android.com> am dea78fa0: Merge "Suppress test differently" into klp-dev

* commit 'dea78fa02ba82c5ecb7fe353b83557aac99c4c6e':
Suppress test differently
5c3e6d4de9ce8ba40eeb107ddc82056502ee719f 01-Oct-2013 Andy McFadden <fadden@android.com> am f6dfa9eb: Merge "Fix up PresentationSyncTest" into klp-dev

* commit 'f6dfa9eb7807ded78f4e740686d629e7eb346d87':
Fix up PresentationSyncTest
bb0a1ffd4cf64cda563bed0d7e40a2181dd58ef3 30-Sep-2013 Andy McFadden <fadden@android.com> am f6dfa9eb: Merge "Fix up PresentationSyncTest" into klp-dev

* commit 'f6dfa9eb7807ded78f4e740686d629e7eb346d87':
Fix up PresentationSyncTest
d5fb821449d0e610322f0a0c77b9150f12e09b10 30-Sep-2013 Andy McFadden <fadden@android.com> Suppress test differently

Some test runners handle @Suppress, some fumble it, causing failures
to be reported. Work around this by removing the annotation and
instead renaming the method so it doesn't begin with "test".

Bug 10843066

Change-Id: Iaabb37e51970e5c82940650c143bbc4678c2caf8
rc/android/media/cts/PresentationSyncTest.java
8e42909746d511e3ad7352db9cd523494727cca7 27-Sep-2013 Sungsoo Lim <sungsoo@google.com> Merge "Increase toleranceMs in testChangeSubtitleTrack"
6d6897caa7c4c3785e11482d8cb4e9585acda8b3 13-Sep-2013 Sungsoo Lim <sungsoo@google.com> Increase toleranceMs in testChangeSubtitleTrack

The toleranceMs in testChangeSubtitleTrack of cts.MediaPlayerTest
is 100 ms, and the wait time for WOULD_BLOCK in TimedTextPlayer is
also 100 ms. This means if WOULD_BLOCK happens, the test will fails.
Thus this CL increases the toleranceMs from 100 ms to 150 ms.

Bug: 9248562
Change-Id: Iaa0f9299b159f55b4754226fd92696a1fce3b138
rc/android/media/cts/MediaPlayerTest.java
da350ca2bff0b28f9173b3a2ba5b4971bf1a00a6 27-Sep-2013 Johann <johannkoenig@google.com> Verify that the first frame is a sync frame

Make sure the vp8 encoder returns a keyframe.

Bug: 8422347
Change-Id: Iab0f3ea91d624f423be5182489a2d58dad437ec8
rc/android/media/cts/Vp8EncoderTest.java
b92635609e8314c8d2f2943b70e1ddf87832daea 27-Sep-2013 Andy McFadden <fadden@android.com> Fix up PresentationSyncTest

On some devices, the GPU seems to get backed up and starts
spoon-feeding surfaceflinger. This prevents the drop-old-frame
logic from doing anything, and the (wobbly to begin with) test fails.

Following the proud traditions of my forebears, I have resolved the
problem by inserting a "sleep" call.

Bug 10898363

Change-Id: I3ed62f5a79008f35c65573b616899517a6d52809
rc/android/media/cts/PresentationSyncTest.java
666bb4a2162445984d864a2d78481e947a39d7ae 26-Sep-2013 Andy McFadden <fadden@android.com> am 42aebd97: am 79bfa122: am 250c23ee: Merge changes I969261d0,Id764d4e0

* commit '42aebd971954af36074dca35f7f25aae4ce6c245':
EncodeDecodeTest: Add more verbose logging about what decoder is chosen
EncodeDecodeTest: Remove some unused variables and fields
42aebd971954af36074dca35f7f25aae4ce6c245 26-Sep-2013 Andy McFadden <fadden@android.com> am 79bfa122: am 250c23ee: Merge changes I969261d0,Id764d4e0

* commit '79bfa12245613f60f174da3175842a308c2211c2':
EncodeDecodeTest: Add more verbose logging about what decoder is chosen
EncodeDecodeTest: Remove some unused variables and fields
64844d2e1a3cab2f4d664d6570acf9bffd0b9147 18-Sep-2013 Oliver Woodman <olly@google.com> resolved conflicts for merge of 339ed213 to master

Change-Id: Id792c8844d6029e7f771203faf4d4c47b7ca26ac
513889b3295e5784751ab7c0b33ced84bc63436c 18-Sep-2013 Oliver Woodman <olly@google.com> Merge "Improve CTS tests for MediaCodec:" into klp-dev
bb2334e2bc23ba7b8ea0bfc309cf2fd9856b177c 17-Sep-2013 Marco Nelissen <marcone@google.com> am 46242d6a: am ccf4c1c0: Merge "Fix and expand media scanner tests." into klp-dev

* commit '46242d6a1e59af4d4a9f35df2c04ee8dc2c543df':
Fix and expand media scanner tests.
ccf4c1c08821747ea5248219177cca78d9b9e53e 17-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Fix and expand media scanner tests." into klp-dev
275cbc88ac41bf7e49309a99bde441d1c64fc077 11-Sep-2013 Oliver Woodman <olly@google.com> Improve CTS tests for MediaCodec:

- Check codecs continue to function (correctly) after a flush.
Nexus10 currently fails this test due to: b/10621959

Change-Id: Ia0819904e0098e33f6f6e854a075ab4f629be916
rc/android/media/cts/DecoderTest.java
9e45a61224175fab45e2f145edc6444e7bab85a5 16-Sep-2013 keunyoung <keunyoung@google.com> am 8ada2634: am ec01499d: Merge "add MediaCodecTest with both video and audio encoding" into klp-dev

* commit '8ada263469ed0d08b59bf0b4ffec0456ad3f8adb':
add MediaCodecTest with both video and audio encoding
b2bc83e3c07f731aa0a0c0e26bc1409c800051e3 16-Sep-2013 keunyoung <keunyoung@google.com> am 82f92d03: am f548241b: Merge "add virtual display encoding test with composition" into klp-dev

* commit '82f92d03d1b3e8c299ca801becd97b5eadd070d6':
add virtual display encoding test with composition
ec01499d0ae71847c77066da9769eafa346007bd 16-Sep-2013 keunyoung <keunyoung@google.com> Merge "add MediaCodecTest with both video and audio encoding" into klp-dev
f548241bf447de9156b5d2cf6727824aaab40271 16-Sep-2013 keunyoung <keunyoung@google.com> Merge "add virtual display encoding test with composition" into klp-dev
a8409acb2ed3d311bb316d149a0117118b7917e9 14-Sep-2013 Lajos Molnar <lajos@google.com> am 8e0818dd: am 58a7ba92: Merge "media.DecodeEditEncodeTest: Increase bitrate for QCIF test" into klp-dev

* commit '8e0818dd7deefb6140107c75104d8c81afbf4cdb':
media.DecodeEditEncodeTest: Increase bitrate for QCIF test
44e3c9dfcf530969f3cb6507503062795171a06c 14-Sep-2013 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 8e3bbb64 to master

Change-Id: Ia0ebb885c933a815c46794c1fea5845ab9721af8
58a7ba9238c9d1a1fcbcef8511f4f639c2175318 13-Sep-2013 Lajos Molnar <lajos@google.com> Merge "media.DecodeEditEncodeTest: Increase bitrate for QCIF test" into klp-dev
90899615cd9f05530c38e5f9ef6adc86ae66b43f 13-Sep-2013 Lajos Molnar <lajos@google.com> media.DecodeEditEncodeTest: Increase bitrate for QCIF test

Some devices fail the color test due to allocating too few bits on
the first I-frame. While this can questionably be a device error
given that we encode the QCIF sample at 1Mbps, we do not specify
a quality requirement for encoders, and the color tolerance is also
somewhat arbitrary.

Change-Id: I9fc7e2acd8961cdb96f8cf90d9c4f7549ae114f7
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10503038
rc/android/media/cts/DecodeEditEncodeTest.java
9fd643eb77a7c61998c7aa196734c2c6faeae3a5 13-Sep-2013 Marco Nelissen <marcone@google.com> am 6627f370: am 602825cf: Merge "Fix the mono test" into jb-mr2-dev

* commit '6627f3706040e6dbd6fd78d2dd0703119d21ff2a':
Fix the mono test
6627f3706040e6dbd6fd78d2dd0703119d21ff2a 13-Sep-2013 Marco Nelissen <marcone@google.com> am 602825cf: Merge "Fix the mono test" into jb-mr2-dev

* commit '602825cfb530106c02a0266e39569cf7bedf1bd5':
Fix the mono test
602825cfb530106c02a0266e39569cf7bedf1bd5 13-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Fix the mono test" into jb-mr2-dev
b6eda98d37b5ed85e4975537fa83dfc77ac2a5df 13-Sep-2013 Jeff Tinker <jtinker@google.com> am df3dda4e: am cbf0bbca: Merge "Fix MediaDrm cts tests" into klp-dev

* commit 'df3dda4ee0cd7c86d0be4fe12364d4b4117ba631':
Fix MediaDrm cts tests
a4b9556894262d319c350bea8693d87a5cc1dcf0 13-Sep-2013 Marco Nelissen <marcone@google.com> Fix and expand media scanner tests.

Fix failing testMediaScanner() and testMediaScannerNotification() tests,
and add a new test for media provider canonicalization

b/10130785
b/10667699

Change-Id: Ic9d057ecc543267489713bdcadf24889e296c353
rc/android/media/cts/MediaScannerNotificationTest.java
rc/android/media/cts/MediaScannerTest.java
9cd57b6389dd8a4342c68951061d1807994c4e57 12-Sep-2013 Jeff Tinker <jtinker@google.com> Fix MediaDrm cts tests

Moving the build of the mock MediaDrm plugin back to
frameworks/av since it can't be installed by cts.

b/10668350

Change-Id: Ic3b3c23de8993577b56ae86a553dcada0b61c606
ndroid.mk
rc/android/media/cts/MediaDrmMockTest.java
bae42fde9119464863701781d05b4bb655e399fe 12-Sep-2013 Marco Nelissen <marcone@google.com> am c7215b16: am bc1cc90f: Merge "Only checksum frames with known color format" into klp-dev

* commit 'c7215b160038ad44cecd163f551b4e60d655d729':
Only checksum frames with known color format
bc1cc90f39db26738cc7eacb0968b059a43aff7b 12-Sep-2013 Marco Nelissen <marcone@google.com> Merge "Only checksum frames with known color format" into klp-dev
cd83c63784d48fa4d82953ecc20f8a1e67fe2e60 11-Sep-2013 Marco Nelissen <marcone@google.com> Only checksum frames with known color format

b/10668206

Change-Id: I152909ce3ca651fe4d7876679e913b70aceed97f
rc/android/media/cts/DecoderTest.java
09c897c2b31926e5d9bade06ab6b0437b5552533 10-Sep-2013 Rachad <rachad@google.com> am 6d9513cc: am ebfee1ab: Merge " Removed RingtoneManager obsolete DRM methods from CTS test. Fixes bug b/10668217" into klp-dev

* commit '6d9513cc847e182d31e32d89823fad1af27cab65':
Removed RingtoneManager obsolete DRM methods from CTS test. Fixes bug b/10668217
ebfee1ab1e5ca207e587cbe0d2fc1b2ac829d1af 10-Sep-2013 Rachad <rachad@google.com> Merge " Removed RingtoneManager obsolete DRM methods from CTS test. Fixes bug b/10668217" into klp-dev
c5f7076b6d7f4ceb2d31ee3a1ce2900b4af52113 10-Sep-2013 Zhijun He <zhijunhe@google.com> am bcb76864: am 6c46c35a: Merge "MediaMuxer: Add setLocation API test" into klp-dev

* commit 'bcb768646d64ac2dad52b3181f513fadfca26792':
MediaMuxer: Add setLocation API test
f2389cd412e334031bb599701b1c0c23c3a38160 10-Sep-2013 keunyoung <keunyoung@google.com> add virtual display encoding test with composition

- For Surface received from MediaCodec, OpenGl composition, which renders using
Texture from UI or another OpenGl rendeting, is done.
- virtual display is created / destroyed multiple times to detect any resource
related issues.

bug: 10653539

Change-Id: I96dc1249a343038e6c39a79192d3cae0edf296f4
rc/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
041fe7d52d0fe35cb0e1d51dc7c5268e3377d47a 10-Sep-2013 Zhijun He <zhijunhe@google.com> MediaMuxer: Add setLocation API test

Bug: 10594784
Change-Id: Ie7f1299101dc91f9cc73ab42bddb2b1ae21cff04
rc/android/media/cts/MediaMuxerTest.java
88233a45174c0946b09c598d9eff6186bc25ef90 10-Sep-2013 Rachad <rachad@google.com> Removed RingtoneManager obsolete DRM methods from CTS test.
Fixes bug b/10668217

Change-Id: Idc1dd0b68d0707b4b2c204c6768f7915851499b9
rc/android/media/cts/RingtoneManagerTest.java
bea6eef1adf23975f7de1f184825f27683e23c90 17-Aug-2013 keunyoung <keunyoung@google.com> add MediaCodecTest with both video and audio encoding

bug: 10361518
Change-Id: Ie13f8b2e7cb751aa8e334f3475986ea8893aae17
rc/android/media/cts/MediaCodecTest.java
2b080fa0dcf06c32b77a6f80e83ce6ac3b931a77 29-Aug-2013 Marco Nelissen <marcone@google.com> More MediaCodec CTS tests

This adds a test that checks that adding an EOS flag on the last non-empty
buffer is the same as adding it on an empty buffer that follows.

b/8747869

Change-Id: Ibaef3f4df9b3d9bfbd67ef4fa3135464ac21af98
rc/android/media/cts/DecoderTest.java
b494e2acd48a775d9383ed2e4a3241b31925e6a8 29-Aug-2013 Jeff Tinker <jtinker@google.com> Merge "Improve MediaDrm cts tests" into klp-dev
d64e65abba0f2ee9f992f429868324fa2c4acfda 29-Aug-2013 Jeff Tinker <jtinker@google.com> Improve MediaDrm cts tests

1. Move the build of the mock drm plugin into the cts tree and
require it to be included, eliminating the manual build step.

2. Fix a test failure due to previous API update

3. Update test to verify b/10528466 (don't expecte plugins to
support an empty mimeType in isContentTypeSupported).

bug: 10528466
Change-Id: Ice60ec09c487398b4f31d14b1951af7a0892fe8f
ndroid.mk
rc/android/media/cts/MediaDrmMockTest.java
3bbf198355cbef68faa78ee615960511ebacd962 27-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> am 8bf744d4: am 5c566a2a: am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev

* commit '8bf744d468680d08a6e5ac1f32d5b56aa5d299e3':
Fix StreamingMediaPlayerTest
8bf744d468680d08a6e5ac1f32d5b56aa5d299e3 27-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> am 5c566a2a: am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev

* commit '5c566a2a60e3d6b4eb4cff7c61100cb1326ce1d1':
Fix StreamingMediaPlayerTest
dd9c0dfa32a58740bfcb36e9687db542530dc529 24-Aug-2013 Andy McFadden <fadden@android.com> Add EncodeVirtualDisplayTest

Tests feeding the output of a virtual display into a MediaCodec encoder.

Bug 10325744

Change-Id: I5b0ddfbd92d5ce6baf289dbe8041b9ed745960c2
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/EncodeVirtualDisplayTest.java
52697ba81d3243ee8d151030e0f8a9d0af2842b3 23-Aug-2013 Andy McFadden <fadden@android.com> Merge "Enable PresentationSyncTest" into klp-dev
bdda008867e645ee1fae34088fd7957b0da7bd69 23-Aug-2013 Jeff Tinker <jtinker@google.com> Merge "cts tests to verify testing supported content types in MediaDrm" into klp-dev
364e1b0094f6cb2d9c9e1bf1e5ed62dc221ef2af 22-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> Fix StreamingMediaPlayerTest

Format 18 videos are now 640x360
Bug: 10388187

Change-Id: If910d07421e6e40948dddb19a4faeca065812a1d
rc/android/media/cts/StreamingMediaPlayerTest.java
c310d7e7a09d604445012cf8ec90bd8ed239f279 22-Aug-2013 Andy McFadden <fadden@android.com> Enable PresentationSyncTest

Throw an exception when reality does not meet expectations.

Bug 10429427

Change-Id: Iabbefddc5e1c85dd34975744c09e945e3685c05b
rc/android/media/cts/PresentationSyncTest.java
0ae9e2387fba194c96b77c43d548c1db3f270903 21-Aug-2013 Jeff Tinker <jtinker@google.com> cts tests to verify testing supported content types in MediaDrm

bug: 10244066
Change-Id: I331f907c15b22b7ba0a1a3b56cbdcc350832e757
rc/android/media/cts/MediaDrmMockTest.java
d049a515354124d1bc56cd036e65330cb5b0640a 21-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> am 4cd308c6: am 4a852f26: Merge "Fix StreamingMediaPlayerTest" into jb-mr2-dev

* commit '4cd308c6e78c56eb98330fe19232f236475da979':
Fix StreamingMediaPlayerTest
4cd308c6e78c56eb98330fe19232f236475da979 21-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> am 4a852f26: Merge "Fix StreamingMediaPlayerTest" into jb-mr2-dev

* commit '4a852f26238c10941c1176cdecf6b1e2f83d44e9':
Fix StreamingMediaPlayerTest
4a852f26238c10941c1176cdecf6b1e2f83d44e9 21-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> Merge "Fix StreamingMediaPlayerTest" into jb-mr2-dev
835f1d130793581ec21d4a346aad15a993cc6d26 21-Aug-2013 Bryan Mawhinney <bryanmawhinney@google.com> Fix StreamingMediaPlayerTest

Format 18 videos are now 640x360

Bug: 10388187
Change-Id: Ida5572028e423dff99eda0a94b5466f4e5e4180a
rc/android/media/cts/StreamingMediaPlayerTest.java
2fa7a6959d67fb9470276a6649c369c411257039 13-Aug-2013 Oscar Rydhé <oscar.rydhe@sonymobile.com> Added support for 3GPP meta data atoms

3GPP metadata is not supported, only iTunes Metadata
Format is supported.

Change-Id: I78b41c88788d5a43800c936e0ac0f98424515c62
es/raw/testvideo.3gp
rc/android/media/cts/MediaMetadataRetrieverTest.java
cbfdbb887bbdd6ea110ae185b88b406df923657e 09-Aug-2013 Marco Nelissen <marcone@google.com> am 8352dddd: am fd19b9a2: resolved conflicts for merge of 1af74334 to jb-mr2-dev

* commit '8352ddddd0b9e62386035e9eda423542495ff8b7':
Add tests for decoding mono files
1001ca9d56f77058ad0946600ea07f694952053a 08-Aug-2013 Marco Nelissen <marcone@google.com> Fix the mono test

Actually check that the reconfigured codec outputs the same data.
b/10095451

Change-Id: I367b410e1765ff126683e1ace5818ea72f5e8f32
rc/android/media/cts/DecoderTest.java
8352ddddd0b9e62386035e9eda423542495ff8b7 08-Aug-2013 Marco Nelissen <marcone@google.com> am fd19b9a2: resolved conflicts for merge of 1af74334 to jb-mr2-dev

* commit 'fd19b9a2580463847ebc59fb21b8ca2bfcf55863':
Add tests for decoding mono files
fd19b9a2580463847ebc59fb21b8ca2bfcf55863 07-Aug-2013 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 1af74334 to jb-mr2-dev

Change-Id: Ib0821744b1d855620c53fbdf86fd828754316ead
721143e529f982a7e138f60b1026c7bf1d630bbe 07-Aug-2013 Marco Nelissen <marcone@google.com> am dbf9ac04: am 3b1ef67a: am a241f99b: Add tests for decoding mono files

* commit 'dbf9ac04cddeb751124bfe909de95f4042ecbfe3':
Add tests for decoding mono files
dbf9ac04cddeb751124bfe909de95f4042ecbfe3 07-Aug-2013 Marco Nelissen <marcone@google.com> am 3b1ef67a: am a241f99b: Add tests for decoding mono files

* commit '3b1ef67a5502084a4a0bee6ab35c3fbf8587d3fc':
Add tests for decoding mono files
a241f99b36f2e5431260c91fe6a2f2b6cded163b 07-Aug-2013 Marco Nelissen <marcone@google.com> Add tests for decoding mono files

Check that the correct number of samples is decoded, and that left and
right channel are identical for decoders that output stereo even for
mono input.

b/10095451

Change-Id: Ibce72e7174b79c2a229f41cba7a8e78bac684832
es/raw/monotestm4a.m4a
es/raw/monotestmp3.mp3
es/raw/monotestogg.ogg
rc/android/media/cts/DecoderTest.java
5a1f0b0fb3478b89e2c79c2ca2a2f0446f0c869f 06-Aug-2013 Marco Nelissen <marcone@google.com> Merge "Add MediaPlayer.setNextMediaPlayer tests"
6cc79ab191d3929a39982c2bd40ecab5a98b982c 05-Aug-2013 Marco Nelissen <marcone@google.com> Add MediaPlayer.setNextMediaPlayer tests

Check that setNextMediaPlayer rejects MediaPlayers that have been reset or
released

Change-Id: Ibf13e81f14edb459534b9be9fdd1a68f35c22bd2
rc/android/media/cts/MediaPlayerTest.java
886ce012a405d7184f3712c56f574e60f013c78a 02-Aug-2013 Andy McFadden <fadden@android.com> Add faster-than-refresh test

We now try to use timestamps to render faster than the display
refresh rate. This works if surfaceflinger drops frames.

Change-Id: Ib94f9661f5a27a4e9a1afd8e340868416c053ce3
rc/android/media/cts/PresentationSyncTest.java
af36783d2a0b4289a3a0da9b17d70bc66ab700fb 31-Jul-2013 Martin Storsjo <martin@martin.st> EncodeDecodeTest: Add more verbose logging about what decoder is chosen

Change-Id: I969261d06852ca9235eff4a7e96d679ce8d214d4
rc/android/media/cts/EncodeDecodeTest.java
8bd7bd389aa6a41b81112b61a9b0ba0a28d89850 01-Aug-2013 Martin Storsjo <martin@martin.st> EncodeDecodeTest: Remove some unused variables and fields

There are still some warnings about unused variables when
VERBOSE is set to false, that disappear if that is changed.

Change-Id: Id764d4e0bfeb5abaa2565cbad49b2e0d3fd5ceca
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/InputSurface.java
c21f275d552b74b8354d6d36b3908b0c523f267e 30-Jul-2013 Lajos Molnar <lajos@google.com> Merge "Change the VP9 test file which has bitstream fix."
ba339d97660c2333e88f82225a595a0bf071b5a5 05-Jul-2013 Vytautas Vaitukaitis <vytautas@google.com> CTS test for AudioTrack.getPlaybackHeadPosition() behavior after flush()

Change-Id: I4ad494120f4e0deed631ebe4288e94a547ad04e8
rc/android/media/cts/AudioTrackTest.java
a6446be421f8294d0220e742fc35548108913e19 25-Jul-2013 hkuang <hkuang@google.com> Change the VP9 test file which has bitstream fix.

Change-Id: Iadd5bd2ac3a256a19a0a874710be71d56d60b76d
es/raw/video_480x360_webm_vp9_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
8c5f8ff37899a176b8e3d9c359b9c50fd8208e8c 24-Jul-2013 Glenn Kasten <gkasten@google.com> Match AudioRecord.getChannelConfiguration docs

Bug: 10001767
Change-Id: I1c59f652d4fb7d9ab287812ead5cabd96821c8e4
rc/android/media/cts/AudioRecordTest.java
29d8b9e41114c340adf2f8681b4bfbdc2dfc9b56 11-Jul-2013 Lajos Molnar <lajos@google.com> Merge "Add CTS tests for VP9 decoder."
04219f2cff3f5d5ba06f88a02982bee341bed65a 28-Jun-2013 Andy McFadden <fadden@android.com> Simple test of buffer presentation time stamps.

Includes a bit of extra code that should either be turned into a
real test or removed. (Currently suppressed from execution.)

Bug 7900302

Change-Id: Idf1c01e382cb4ff9272c48528d02ca6463df00a2
rc/android/media/cts/InputSurface.java
rc/android/media/cts/PresentationSyncTest.java
4b6a3ae8e65025ad4bcf400016d752d7fe320574 28-Jun-2013 hkuang <hkuang@google.com> Add CTS tests for VP9 decoder.

Change-Id: I46edc5421f37294eaf3653fd513f63a70a49bc48
es/raw/video_480x360_mp4_vp8_333kbps_25fps_aac_stereo_128kbps_44100hz.webm
es/raw/video_480x360_webm_vp8_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
es/raw/video_480x360_webm_vp9_333kbps_25fps_vorbis_stereo_128kbps_44100hz.webm
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/MediaCodecListTest.java
40257822eebffc10db67341bab364ccf64b48f16 26-Jun-2013 Andy McFadden <fadden@android.com> Merge "Tweaks to CTS media tests"
621d685ec84ef3900484d5de2057adbc02931b61 26-Jun-2013 Andy McFadden <fadden@android.com> Tweaks to CTS media tests

Minor tweaks:

- changed cleanup (again)
- moved entirely to EGL14

Change-Id: I8f61b0f45df2c10bec8e7aa54b48f2de42772ee2
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/InputSurface.java
rc/android/media/cts/OutputSurface.java
fd6108c4529827cbec64390ae3dc4e21864e898e 26-Jun-2013 Lajos Molnar <lajos@google.com> Merge "Update VP8EncoderTest to use new VP8 decoder and encoder names"
e23c21ceb87ee2bbe99486ad52183a498ebaeb21 24-Jun-2013 hkuang <hkuang@google.com> Update VP8EncoderTest to use new VP8 decoder and encoder names

Change-Id: I9d6a29b0e9fd281761e325e461a5430d66194960
rc/android/media/cts/Vp8EncoderTest.java
801e74fcd960ee168bd4af4192691b55c8beae66 20-Jun-2013 Bryan Mawhinney <bryanmawhinney@google.com> am 8d123bdd: am c05b9f33: Replace deprecated YouTube streamer urls

* commit '8d123bdd3e995f46561a288e1af1a3f0c34faab3':
Replace deprecated YouTube streamer urls
8d123bdd3e995f46561a288e1af1a3f0c34faab3 20-Jun-2013 Bryan Mawhinney <bryanmawhinney@google.com> am c05b9f33: Replace deprecated YouTube streamer urls

* commit 'c05b9f3339729cc1c0857d53148b18a39c6e267d':
Replace deprecated YouTube streamer urls
c05b9f3339729cc1c0857d53148b18a39c6e267d 19-Jun-2013 Bryan Mawhinney <bryanmawhinney@google.com> Replace deprecated YouTube streamer urls

Bug: 7688709
Change-Id: I33251dc173d7acc4a6d111c704d8a6464d0040c8
rc/android/media/cts/StreamingMediaPlayerTest.java
c0db781ad056427af212c72bb48b68c63051fbdd 13-Jun-2013 Andy McFadden <fadden@android.com> EGL cleanup tests

Fixed WrapperTest to perform the cleanup correctly.

Added a native variant that does the cleanup both correctly and
incorrectly (the latter disabled by default). It's sufficiently
devoid of test-harness-isms to be easy for vendors to run separately.

Also, fixed EGL cleanup in media tests.

Bug 9209776
Bug 9301080

Change-Id: I4574aaf57ec579f77c5968a0819b13c5dc6b26e0
rc/android/media/cts/InputSurface.java
rc/android/media/cts/OutputSurface.java
5c4728b370ebc9d126644f788ab800ebbe0514b6 05-Jun-2013 Keun-young Park <keunyoung@google.com> am 38913ccc: am d5e0f181: am df7c4c62: Merge "cts: media: support no camera device in testSetMaxFileSize"

* commit '38913ccc8d62512df92dc9533e2fdbf525f815b0':
cts: media: support no camera device in testSetMaxFileSize
38913ccc8d62512df92dc9533e2fdbf525f815b0 05-Jun-2013 Keun-young Park <keunyoung@google.com> am d5e0f181: am df7c4c62: Merge "cts: media: support no camera device in testSetMaxFileSize"

* commit 'd5e0f1812692406be0add5388c71e72d896c3c9b':
cts: media: support no camera device in testSetMaxFileSize
d5e0f1812692406be0add5388c71e72d896c3c9b 05-Jun-2013 Keun-young Park <keunyoung@google.com> am df7c4c62: Merge "cts: media: support no camera device in testSetMaxFileSize"

* commit 'df7c4c6248c3c1bb6ec9309a677a33aa9cf1a1c0':
cts: media: support no camera device in testSetMaxFileSize
248dd1d5ddacad5d463687a5792632544cf839c3 05-Jun-2013 Andy McFadden <fadden@android.com> Merge "Add a function to save GL frame to a PNG"
d24da5f596447dc60796557681714a0e701c967a 05-Jun-2013 Andy McFadden <fadden@android.com> Add a function to save GL frame to a PNG

This adds a debug utility function that grabs the current GL frame
with glReadPixels, compresses it, and saves it on disk as a PNG.

Change-Id: I6e558233b3072a73bcce20275550857c2b3f50b4
rc/android/media/cts/TextureRender.java
cc540a5e7484e5cb1756106f44937150895d14f8 04-Jun-2013 Marco Nelissen <marcone@google.com> Revert "Don't test reconfiguration for Vorbis"

This reverts commit 1cb78bd1bff9850ec792a1b73d47fd7707f2f0ec.
rc/android/media/cts/DecoderTest.java
efd5acb1c8888b26252f2c4d69daef407a7b6fa0 04-Jun-2013 Marco Nelissen <marcone@google.com> am 7ec57fbd: am 03a036f3: Merge "Don\'t test reconfiguration for Vorbis" into jb-mr2-dev

* commit '7ec57fbdefee59e552509b5625a9057d2c73f857':
Don't test reconfiguration for Vorbis
03a036f32fb0f77f4360cb83f052e329608c350d 04-Jun-2013 Marco Nelissen <marcone@google.com> Merge "Don't test reconfiguration for Vorbis" into jb-mr2-dev
1cb78bd1bff9850ec792a1b73d47fd7707f2f0ec 04-Jun-2013 Marco Nelissen <marcone@google.com> Don't test reconfiguration for Vorbis

Vorbis decoder reconfiguration is currently broken due to a race condition.
b/9105408

Change-Id: I741a7adfadb971520071a3a630857e7adae7aaee
rc/android/media/cts/DecoderTest.java
52d299e46de62209ccedbfe4000440b95be7a6ca 04-Jun-2013 Bryan Mawhinney <bryanmawhinney@google.com> Resurrect MediaPlayerFlakyNetworkTest

Seems to pass on N4, but I saw a couple of ANRs on N7 that may need investigation.
Let's see if we can get this passing on all Nexus devices for K!

Change-Id: I15467705fdb7eefa10563c0a9e85e417b8300917
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
a74edd9c4004a427780497f9721fd314a3695c7d 31-May-2013 Guru Nagarajan <gurunagarajan@google.com> am f08f5e3f: am 202ccb4b: Merge "Bail out early in case of error" into jb-mr2-dev

* commit 'f08f5e3f89dea511578ebc9a159e28a252f6f264':
Bail out early in case of error
202ccb4b063823dd2902128b530e703622b1d4f3 31-May-2013 Guru Nagarajan <gurunagarajan@google.com> Merge "Bail out early in case of error" into jb-mr2-dev
0fd282986023b453204d6c0ce4937984a718dade 31-May-2013 Andy McFadden <fadden@android.com> am a7d8b52c: am 437a5c63: Merge "Fix coordinate count" into jb-mr2-dev

* commit 'a7d8b52ccd8d9863cbec56d690f5632569c79233':
Fix coordinate count
437a5c6358226aa668fa5bd25699f3aeb2059bbd 31-May-2013 Andy McFadden <fadden@android.com> Merge "Fix coordinate count" into jb-mr2-dev
3f278c3f46f43718ffdea31b7639e828e419d913 31-May-2013 Andy McFadden <fadden@android.com> Fix coordinate count

"UV" is two, not three.

Bug 9055251

Change-Id: I435ccb65fe7b0b8f3c9f07fa5ae04c41f045bedf
rc/android/media/cts/TextureRender.java
addcfe9708e02ac6cc2d41a30d4c4ab22d7b95e8 31-May-2013 Marco Nelissen <marcone@google.com> Bail out early in case of error

Otherwise the test will loop until CTS times out after 10 minutes,
and there will be no useful information in the logs anymore.

This is for tracking down the cause of b/9105408

Change-Id: I99c676880c247b5060eeeb1b950508ec57a70d60
rc/android/media/cts/DecoderTest.java
e63d3e1fa0d6989e21624c4e8c1f19b9e12da885 31-May-2013 Jesse Hall <jessehall@google.com> am 2f73ddf1: am da11f73e: Merge "Fix check for current EGL context" into jb-mr2-dev

* commit '2f73ddf1ada3cde7bf28ecbb22a04f61d0980f34':
Fix check for current EGL context
3d556c2e8fdaacbfd8f08d427c4e12877ce5f4a0 31-May-2013 Jesse Hall <jessehall@google.com> am 3c4d6a47: am 45eb58e3: Merge "Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests" into jb-mr2-dev

* commit '3c4d6a47ddb9db17e5c3a7f8373a09d77c252550':
Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests
ae50151ec0b3d3a6998aba950473d34c609fc49b 30-May-2013 Jesse Hall <jessehall@google.com> Fix check for current EGL context

Bug: 9055251
Change-Id: I97c361bc92cbd10fbd2b2ec9196991d2379bac96
rc/android/media/cts/InputSurface.java
rc/android/media/cts/OutputSurface.java
cb2349d017a31e06d207ca4d897ab6e34a03960c 30-May-2013 Jesse Hall <jessehall@google.com> Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests

Bug: 8329090
Change-Id: I84e8645fdedcd45c4fdd29265967f0cc27356f21
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
da8f60840d87a16a9ea0b36b8251a33084937438 29-May-2013 Jun Su <juns@nvidia.com> cts: media: support no camera device in testSetMaxFileSize

For no camera devices, should not open video source.
Also, if we do only audio record, it will not be able
to finish before timeout.

Change-Id: Id609903979a95ec525361e4081607810e3edfe6a
Signed-off-by: Jun Su <juns@nvidia.com>
rc/android/media/cts/MediaRecorderTest.java
9f9375df80c2560c8549d3d61454e52fa885c9a2 22-May-2013 Lajos Molnar <lajos@google.com> DecoderTest: add VP8 and MPEG-4 tests

Created tests for VP8 and MPEG-4 akin to existing H264 tests.

Change-Id: I090e41aba3b781d4714e2e5da3c877e287b8f2e5
Signed-off-by: Lajos Molnar <lajos@google.com>
es/raw/video_480x360_mp4_mpeg4_860kbps_25fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_480x360_mp4_vp8_333kbps_25fps_aac_stereo_128kbps_44100hz.webm
rc/android/media/cts/DecoderTest.java
128694ba219659686767bba6d43c01c5e07a8631 20-May-2013 Jamie Gennis <jgennis@google.com> Make EncodeDecodeTest aware of crop rects.

Bug: 8329090
Change-Id: I8090b0ab66fb772a5ebecff49144ac8376db3413
rc/android/media/cts/EncodeDecodeTest.java
88a4a1cc18291c4233beb36cf71bc4c7c3f2066e 16-May-2013 Andy McFadden <fadden@android.com> Adjust timestamp scale

BufferQueue item timestamps are in nanoseconds, MediaCodec buffer
timestamps are in microseconds.

Bug 8988357

Change-Id: I940aa706af85b568642148e3495f22611f1ef9b8
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
rc/android/media/cts/InputSurface.java
ed3bb0e981a3d905d89e13ed15699caa014cf35f 10-May-2013 Flavio Lerda <flerda@google.com> Merge "Add CTS test for encoder and muxer interaction." into jb-mr2-dev
8aef15c469de6972038342c3e5942db86affc0a9 04-May-2013 Jesse Hall <jessehall@google.com> Merge "eglPresentationTimeANDROID moved to EGLExt from EGL14" into jb-mr2-dev
97b4abf2f0521a72db7b01de3a88d43be249d611 02-May-2013 Andy McFadden <fadden@android.com> Merge "Adjust bit rate based on resolution" into jb-mr2-dev
567f12f60243b765699060aeea658da489939215 21-Apr-2013 Flavio Lerda <flerda@google.com> Add CTS test for encoder and muxer interaction.

This commit adds a test that tests the interaction between the
MediaCodec encoder and the MediaMuxer, particularly the way codec
configuration is transferred between the two.

Bug: 8616651
Change-Id: I7f8ff2a0bb544fc8020c1d3c06f494df0a24d5a8
rc/android/media/cts/ExtractDecodeEditEncodeMuxTest.java
071937f3dd8584cca7c1feb48fab17f527fadf68 02-May-2013 Jesse Hall <jessehall@google.com> eglPresentationTimeANDROID moved to EGLExt from EGL14

Bug: 8678160
Change-Id: Id80ae99608bfc745f5619733471c2df48472a47c
rc/android/media/cts/InputSurface.java
ad07b2413d41794c42b662a58482cc7f0dc83ade 02-May-2013 Jeff Tinker <jtinker@google.com> Merge "Update MediaDrm exception handling" into jb-mr2-dev
d131feadbf4f74bfafc256b7e7066085ddcfea27 01-May-2013 Andy McFadden <fadden@android.com> Adjust bit rate based on resolution

Use higher bit rates for higher-resolution video.

Bug 8329029

Change-Id: Idb0c2673b0a1feb4e6a82279e1200f2b8dd41597
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
32aaf552bcae2596bb55502b8a3ae481b5ca3ab4 30-Apr-2013 Jeff Tinker <jtinker@google.com> Update MediaDrm exception handling

bug: 8725707
Change-Id: Ib3059dbce3d1bbf909fb2b942db75acec8c8992a
rc/android/media/cts/MediaDrmMockTest.java
47c27a337e008feb25fc68665cb6db6ffee2d0cb 26-Apr-2013 Marco Nelissen <marcone@google.com> Check behavior at EOS, verify timestamps

When signalling EOS at a sample in the middle of the stream, check that
we still get the expected number of frames from the decoder, and verify
that the timestamps coming out of the decoder are the same ones we
passed in to it.
b/8718191

Change-Id: Ic529c67997256283f38656339f3119c921a43ccc
rc/android/media/cts/DecoderTest.java
78c2301e2d194289926247992b1d031f1e62facf 20-Apr-2013 Marco Nelissen <marcone@google.com> Add more MediaCodec.flush() related tests

b/8543366

Change-Id: If6af369fc6b58d952f911d33c5e54ef582e8fb39
rc/android/media/cts/DecoderTest.java
4a717f0bd2bbe5fe866d355c88709c8d762353f7 18-Apr-2013 Jeff Tinker <jtinker@google.com> Merge "Update CTS tests to be consistent with MediaDrm API review update" into jb-mr2-dev
77b9d92cde7ca35785bffe071990a22c2b189d50 17-Apr-2013 Jeff Tinker <jtinker@google.com> Update CTS tests to be consistent with MediaDrm API review update

bug: 8603279
Change-Id: Id1ae05a2430e5d314446a18f676e49ef50a8982a
rc/android/media/cts/MediaDrmMockTest.java
61cd0534137ebc9ba88e636daaafeeb106430180 17-Apr-2013 Jeff Tinker <jtinker@google.com> Merge changes Ie410c1ae,I8dbab7e3 into jb-mr2-dev

* changes:
Added CTS test to complete MediaDrm offline API change clarification
Adding CTS test for secure stop APIs
cc49e3b0292c2186411b134282c3b93011d28734 17-Apr-2013 Jeff Tinker <jtinker@google.com> Added CTS test to complete MediaDrm offline API change clarification

b/8603820

Change-Id: Ie410c1ae2d78b76b2304c3b2f010e0b5bf8144ac
rc/android/media/cts/MediaDrmMockTest.java
60f4b341506c20491e5e9e896dae010af01ae47e 09-Apr-2013 Jeff Tinker <jtinker@google.com> Adding CTS test for secure stop APIs

bug: 8604418

Change-Id: I8dbab7e32ea536132c2f2d6f40e4c35ca64ee812
rc/android/media/cts/MediaDrmMockTest.java
6f0516cb9e0526a958d09332a74bf4d7b0beaeb3 16-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Refactor DecoderTest" into jb-mr2-dev
1c031caa17216d9a2a4833265cf11f605d32d508 16-Apr-2013 Marco Nelissen <marcone@google.com> Merge "Add CTS tests for MediaCodec.flush()" into jb-mr2-dev
0f2f794190373716389ea9962e73e0820e0b0804 15-Apr-2013 Andreas Huber <andih@google.com> MediaExtractor.setDataSource is now properly documented as throwing

IOException. Update cts tests.

related-to-build

Change-Id: I60a1b88517a8fbae29d1389babf439519ce77127
rc/android/media/cts/MediaMuxerTest.java
8912af7bbbcb1c2ca50d566ef2ec7caa0101acf5 13-Apr-2013 Marco Nelissen <marcone@google.com> Refactor DecoderTest

This change is identical in functionality to the previous code, but
makes it easier to reuse code for future tests.

b/8543366

Change-Id: If308c2337acc17854b897099528264522d83083b
rc/android/media/cts/DecoderTest.java
16f2181e994ebf6edd5c66c768a2bcb23e34b2a2 12-Apr-2013 Marco Nelissen <marcone@google.com> Add CTS tests for MediaCodec.flush()

b/8543366

Change-Id: I4df45c6e9ead5b6ded5a6813cd1109aeb7c7c7d6
es/raw/loudsoftaac.aac
es/raw/loudsoftfaac.m4a
es/raw/loudsoftitunes.m4a
es/raw/loudsoftmp3.mp3
es/raw/loudsoftogg.ogg
es/raw/loudsoftwav.wav
rc/android/media/cts/DecoderTest.java
8391e6f817edb2adc3f7250650aef496843c0626 04-Apr-2013 Glenn Kasten <gkasten@google.com> Fix CTS tests for AudioTrack.setPlaybackHeadPosition()

Tests were incorrectly expecting that setPlaybackHeadPosition() did
something meaningful and returned success for a streaming AudioTrack.
AudioTrack implementation now disallows setPlaybackHeadPosition for
streaming. This change fixes the tests to use a static buffer AudioTrack
with setPlaybackHeadPosition().

Bug: 8181114
Change-Id: I61c19b2f75351f18d2b312e065ef601c2cda37a3
rc/android/media/cts/AudioTrackTest.java
717ced18b52a427221d70880dc7b7d4ebcfffb49 05-Apr-2013 Glenn Kasten <gkasten@google.com> Merge "Use assertEquals instead of assertTrue" into jb-mr2-dev
c19c9a93258139517acb196ca5494378f51087b0 04-Apr-2013 Glenn Kasten <gkasten@google.com> Use assertEquals instead of assertTrue

assertEquals provides more meaningful error logs when the test fails,
which was helpful in order to investigate the associated bug. This change
does not correct all places where assertEquals would be useful, but only
those needed for this bug (and one other bug that was also failing).

Bug: 8181114
Change-Id: I62e807749c29721287aecf61e60dd80fd7e62f20
rc/android/media/cts/AudioTrackTest.java
2fe00f3aa087cc8dca70868d096ccc0da5ebeb2e 02-Apr-2013 Jeff Tinker <jtinker@google.com> Add CTS tests for async event callouts from drm plugin to Java app

Change-Id: Icf468ab418ab4a4c8ffc9e03fc56fe1a62aaacc7
rc/android/media/cts/MediaDrmMockTest.java
71df0d40e86e30dde9862134427b3f52040e5899 31-Mar-2013 Jeff Tinker <jtinker@google.com> Add CTS tests for MediaDrm API update

Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: I4fa27d4ec3e62616cc6d8d0c424ba2e16b7127a1
rc/android/media/cts/MediaDrmMockTest.java
f1a493b1cc81290265571d65fd6ed96162b19bea 25-Mar-2013 Eric Laurent <elaurent@google.com> Merge "AudioManagerTest: modifications for fixed volume" into jb-mr2-dev
8a59f5b41e09ec3ba68ada2c02f7babeda434900 20-Mar-2013 ztenghui <ztenghui@google.com> Merge "Add the orientation hint test." into jb-mr2-dev
dbc84c0ebca8749aa921ba58bd4c7e5f343003f2 20-Mar-2013 Jeff Tinker <jtinker@google.com> Merge "Adding CTS tests for the MediaDrm APIs" into jb-mr2-dev
54e3247a7b0fac74094035082e3a28adc220fc3c 20-Mar-2013 Eric Laurent <elaurent@google.com> AudioManagerTest: modifications for fixed volume

Modified volumes and ringer mode tests to take into account new
configuration option for fixed volume.

Bug 8161458

Change-Id: I9f9a48a165b921c93a5a9491cbdf746ba646d815
rc/android/media/cts/AudioManagerTest.java
5af0e1e8400da554ab2f66673427eba7bc73ce43 09-Mar-2013 Jeff Tinker <jtinker@google.com> Adding CTS tests for the MediaDrm APIs

Change-Id: Ie63832af8220d7bf6249de6b881864772cdaec3b
rc/android/media/cts/MediaDrmMockTest.java
87c0dc241d1451624e7988f9a72deb81e43500e2 18-Mar-2013 ztenghui <ztenghui@google.com> Add the orientation hint test.

Also update the formats and switch to MediaMetaDataRetriever.

bug:7991013

Change-Id: Icc904c24fa51153a262987867a93e50c9af1c41f
rc/android/media/cts/MediaMuxerTest.java
b4ad734f7ef468bab8cb23d955a4d23f4ff965c7 18-Mar-2013 ztenghui <ztenghui@google.com> Merge "MediaMuxer CTS test" into jb-mr2-dev
25389716e560611ff74bbdb5e76b5c68cdc8c562 15-Mar-2013 Andy McFadden <fadden@android.com> Log color component error

Keep track of the largest discrepancy seen in any color component
during a test, and log it at the end. Useful for seeing how close
to the edge the successful tests are.

Bug 8398426

Change-Id: Ib7d0e0877da2d4dea2b485f9434f7c9b9b1da22f
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
59acf8f708b4810e9c866a1e05d6702de618e022 12-Feb-2013 ztenghui <ztenghui@google.com> MediaMuxer CTS test

bug:7991013

Change-Id: Ibc2c20062df1e259ee529e0338aac8ddce564303
es/raw/video_only_176x144_3gp_h263_25fps.mp4
rc/android/media/cts/MediaMuxerTest.java
1238404061345c88bce287c665f825f8d188cff9 08-Mar-2013 Andy McFadden <fadden@android.com> Show expected values in log

Log the expected values as well as the actual values when
something looks wrong.

Change-Id: Ibf53ad318af0c5de8e6b10f59d75ff55cb781f22
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
813027dfa9792bb83ea61240680305d6ba50d25a 07-Mar-2013 Andy McFadden <fadden@android.com> Rename COLOR_FormatAndroidOpaque

Track rename of COLOR_FormatAndroidOpaque to COLOR_FormatSurface.

Bug 7991062

Change-Id: I51b64ade705f5340cf2b56a2ca1155d2c1cf4ceb
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/MediaCodecTest.java
545d0e05bd858aff400410c2ac6d83ccedb258a6 05-Mar-2013 Andy McFadden <fadden@android.com> Added more MediaCodec tests

The MediaCodecTest methods test various API edge cases.

Also, fixed file permissions on MediaCodecListTest.java, and reduced
import lists on existing tests.

Bug 7991062

Change-Id: I777cbeef428e5e7aabf4ce65094a2320c1e55c07
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/MediaCodecListTest.java
rc/android/media/cts/MediaCodecTest.java
f3a5f8531b953c697a2eda26a91e5c633f1e26ea 05-Mar-2013 Andy McFadden <fadden@android.com> Pass PTS through the MediaCodec tests

Use the existing APIs and/or the new EGL call to pass the
presentation time stamp through video encode/decode.

Bug 8191230

Change-Id: I4bf381934ff2e75d15f49b3be7696cc3ff5408bb
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/InputSurface.java
be8a59a596f7f72f26582f83f2430dac2f4f2578 05-Feb-2013 Andy McFadden <fadden@android.com> Added video edit test

Generate video, edit it with GL, then decode it to verify that the
end result is what we expected.

Added Surface-->Surface tests to EncodeDecodeTest. Shared some
code between that and the new test. Tweaked test values.

Bug 7991062

Change-Id: I669344ca0a56c5b6fcb83f8db85b3246dbe103fe
rc/android/media/cts/DecodeEditEncodeTest.java
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/InputSurface.java
rc/android/media/cts/OutputSurface.java
rc/android/media/cts/TextureRender.java
8ad15502dc39a0167e471be22a4a855c5e3803e3 01-Feb-2013 Kunter Gultekin <kuntergultekin@google.com> Basic verification tests for VPX encoder.

A basic confirmation about a frame being properly
encoded is done by trying to decode it.
(Since in realtime mode vp8 encode output is non-
deterministic, a md5 sum comparison wouldn't work.)

A raw yv12 stream is encoded and written to
an IVF file, which is later decoded by vp8 decoder to
verify frames are at least decodable.

Associated raw stream and IVF reader+writer is included.

Change-Id: Ib672794ce5dca3812b5b16d54f74d4590502346b
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
es/raw/video_176x144_yv12.raw
rc/android/media/cts/IvfReader.java
rc/android/media/cts/IvfWriter.java
rc/android/media/cts/Vp8EncoderTest.java
f4927387bdefd7fa465e05c02677759618ae162e 04-Feb-2013 Andy McFadden <fadden@android.com> Refactor VideoRender

The VideoRender class inside VideoSurfaceView is generally useful
for code that wants to render a texture to a Surface. Split it out
into its own class.

Change-Id: I38ddb213a3fb5bca1c790b5b788465b367c9837e
rc/android/media/cts/EncodeDecodeTest.java
rc/android/media/cts/TextureRender.java
rc/android/media/cts/VideoSurfaceView.java
a4868789ce153b45e85cc1627181f57139e9a343 04-Feb-2013 Andy McFadden <fadden@android.com> Improve EncodeDecodeTest

Made Surface-based test reliable by blocking until onFrameAvailable
is called. Added test on decoded frame count. Ignore all
unsupported formats in the ByteBuffer output test, not just the ones
we recognize.

Misc cleanup.

Bug 8091782

Change-Id: I48ffd50dd52c344d11ea49eaa4e7326d098c87fc
rc/android/media/cts/EncodeDecodeTest.java
6b1f74af2b95c482fff4c1744c9cfa5a1a186320 24-Jan-2013 Andy McFadden <fadden@android.com> Test encode+decode of AVC video stream

Two tests, based on a series of generated frames. One test outputs
to ByteBuffers, the other to a Surface. Tests are currently run at
three different resolutions.

Hat tip:
https://android-review.googlesource.com/#/c/43372
https://android-review.googlesource.com/#/c/43410

Bug 7991062
Bug 8091782

Change-Id: I52c048c8a71a42090420139e028371c92132a163
rc/android/media/cts/EncodeDecodeTest.java
b2a4b59e58cce4e65c7c9347295007a735e995a7 18-Jan-2013 James Dong <jdong@google.com> Merge "Add a cts test case for MediaPlayer's getTrackInfo()."
d44af65f4a12995c6482732cce3006f70675defa 25-Sep-2012 Insun Kang <insun@google.com> Add a cts test case for MediaPlayer's getTrackInfo().

Change-Id: I1aeceb6054b446b4bc91c507921241782c09de1f
rc/android/media/cts/MediaPlayerTest.java
460d28a1b0b11c8c65da27dd29103af47546004e 16-Jan-2013 Keun-young Park <keunyoung@google.com> am 5b83c330: am 03a40e30: am 70c114f3: am c13d0c87: am 320b8e53: Merge "Improve testSetNextMediaPlayer test" into jb-dev

* commit '5b83c330ce0e04dbbe04ea99231d5dc91fcbe57f':
Improve testSetNextMediaPlayer test
03a40e30d29d504c6c92edbb9bcdb335b4f2f656 16-Jan-2013 Keun-young Park <keunyoung@google.com> am 70c114f3: am c13d0c87: am 320b8e53: Merge "Improve testSetNextMediaPlayer test" into jb-dev

* commit '70c114f3625081a0b40a6a58b0b3a3d49e481598':
Improve testSetNextMediaPlayer test
70c114f3625081a0b40a6a58b0b3a3d49e481598 16-Jan-2013 Keun-young Park <keunyoung@google.com> am c13d0c87: am 320b8e53: Merge "Improve testSetNextMediaPlayer test" into jb-dev

* commit 'c13d0c87d0c869008a58a335255728e1daadecbd':
Improve testSetNextMediaPlayer test
338db6d15d82d3d4d12e4fbd300087917b240361 15-Jan-2013 Marco Nelissen <marcone@google.com> Improve testSetNextMediaPlayer test

This catches some issues observed on devices in the field.
b/7952350
b/7950253

Change-Id: Ifa77d2001427e58e5339a2c223c3fedf60be847d
es/raw/test1m1s.mp3
rc/android/media/cts/MediaPlayerTest.java
4f0d3b9d18388d010f15dd0bf0b0596886ff5c1e 20-Dec-2012 Marco Nelissen <marcone@google.com> Test video decoder EOS behavior.

Change-Id: I7c08de6d1feaf0e6ae1b4ff0d09af984a395ae2f
rc/android/media/cts/DecoderTest.java
7e8aea6dae7e7b9f9ff40158c83303c96c04f090 19-Dec-2012 Marco Nelissen <marcone@google.com> Tweak MediaCodec decoder tests

Some decoders can emit a zero sized buffer, which we shouldn't count
as an actual frame.
Also enable decoder re-use tests for mp3 and m4a.

Change-Id: Iffab266c52afd2a1b93d8d6f5912357ff7e30c79
rc/android/media/cts/DecoderTest.java
ec84c91ca2110ef00727f7dd24a8b0e02859c4fb 13-Dec-2012 Marco Nelissen <marcone@google.com> Test that MediaCodec reconfiguration works

Change-Id: I64220938923737d3b62055790deacc9cb09783c4
rc/android/media/cts/DecoderTest.java
73a96904f650de30a7d40afa3e5ea6ddac4ccdb6 10-Dec-2012 Marco Nelissen <marcone@google.com> am 44b6afc6: am 3afa402b: am 846e9bb2: Merge "Add test for MediaScanner misbehavior" into jb-dev

* commit '44b6afc63ad5795c2f338e7eb3919ce5de13bccf':
Add test for MediaScanner misbehavior
44b6afc63ad5795c2f338e7eb3919ce5de13bccf 10-Dec-2012 Marco Nelissen <marcone@google.com> am 3afa402b: am 846e9bb2: Merge "Add test for MediaScanner misbehavior" into jb-dev

* commit '3afa402b5a1c366f6095537817dc4ca8cefa84d7':
Add test for MediaScanner misbehavior
846e9bb2c35eaf2f88c8a70a18fb6819d2693dc1 10-Dec-2012 Marco Nelissen <marcone@google.com> Merge "Add test for MediaScanner misbehavior" into jb-dev
698bc40cd8fc55d48f2adc90a2856200891b6ef2 10-Dec-2012 Andreas Huber <andih@google.com> am 48138683: am e22e8b80: am 2bf7a779: Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev

* commit '4813868364b0b2a0a7fb2ee8369242e75ffce8fb':
Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)
031e99bb4d93971488107a9b9bab5fb5ace9cd7d 10-Dec-2012 Andreas Huber <andih@google.com> am d20ea30f: am d0c50f2b: am de326fe1: Add a CTS test that iterates through all codecs using MediaCodecList and

* commit 'd20ea30ffd1593c8719840568bff572764ff84b4':
Add a CTS test that iterates through all codecs using MediaCodecList and
4813868364b0b2a0a7fb2ee8369242e75ffce8fb 10-Dec-2012 Andreas Huber <andih@google.com> am e22e8b80: am 2bf7a779: Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev

* commit 'e22e8b808614dbd4929b089193038f1ceec126e8':
Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)
d20ea30ffd1593c8719840568bff572764ff84b4 10-Dec-2012 Andreas Huber <andih@google.com> am d0c50f2b: am de326fe1: Add a CTS test that iterates through all codecs using MediaCodecList and

* commit 'd0c50f2bb75929f71b72778e8fccef075d3595fc':
Add a CTS test that iterates through all codecs using MediaCodecList and
2bf7a779034166f99cf57aa6285a9e12d4208239 10-Dec-2012 Andreas Huber <andih@google.com> Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev
e504c24d7323c49a9bbbf30b244607da58bba19a 30-Nov-2012 Marco Nelissen <marcone@google.com> Add test for MediaScanner misbehavior

Back in Eclair, a bug that could cause files to be deleted from the
sd card was fixed. Unfortunately, some OEM customizations caused this
bug to reappear in subsequent OEM releases.
Add a check for the misbehavior to ensure it won't happen again.

Change-Id: I80655d0a8493e53aa7cd8f4c8e5e6181fcbd9c9e

cherrypicked from ICS
rc/android/media/cts/MediaScannerNotificationTest.java
rc/android/media/cts/ScannerNotificationReceiver.java
de326fe13f8dbe934598c7c7cf902e7a9109fde2 07-Dec-2012 Andreas Huber <andih@google.com> Add a CTS test that iterates through all codecs using MediaCodecList and

calls getCapabilitiesForType for every type supported by any codec. Also
makes sure that all components published through MediaCodecList can at
least be instantiated.

Change-Id: I6e30e92e6846b6045f51bbd5e2aa66e80c317119
rc/android/media/cts/MediaCodecListTest.java
3a59dce3e30d36f8966fe0e21e9fae2a76685ba2 07-Dec-2012 Andreas Huber <andih@google.com> Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)

Change-Id: I53d75f875f26921cf11e99a966cd65da4de22807
rc/android/media/cts/EncoderTest.java
9a902635eeacdaa17098a7412978c1cab0517cf7 06-Dec-2012 Marco Nelissen <marcone@google.com> Fix ringtone test

Explicitly test both a silent and a non-silent ringtone, so we're not
dependent on what the system setting is.
b/7664214

Change-Id: I1f1d34172e76845b3a5b491600f11d67dabc1f8d
rc/android/media/cts/RingtoneTest.java
1375b6674b3b2f1b6574ddebdafced275f9091c7 08-Nov-2012 Brian Muramatsu <btmura@google.com> Increase timeout for testSetMaxFileSize test

Bug 7497772

Change-Id: Ibe635df5d7f8e240561db8921d076a8c8290c578
rc/android/media/cts/MediaRecorderTest.java
d63f7cfb7552381c9fc8515ffb35b20919958344 24-Oct-2012 James Dong <jdong@google.com> Make the cts test record a bit longer

The initial delay of the recording increases from 700 ms to 1000 ms, due to the change
of some audio assets. As a result, recording 1000 ms may end up recording nothing; hence
the expected stop failure.

This patch increases the recording duration from 1 second to 3 seconds, and changed some
hardcoded values to use constants for easier maintence in the future.

o related-to-bug: 6971305

Change-Id: I9642087fad74c696ee5882c25892095ed89ac62f
rc/android/media/cts/MediaRecorderTest.java
12973595a23ae30df46954331f07afcc88e9dd96 22-Oct-2012 Glenn Kasten <gkasten@google.com> Record latency test not applicable per revised CDD

Bug: 6970978
Change-Id: Iff204ca54023a7d834f01a898abac962982eccc8
rc/android/media/cts/AudioRecordTest.java
70d002367c94dae15fe19029f5f8dc13ed5054c0 10-Oct-2012 Keun young Park <keunyoung@google.com> nuke RTSP tests from StreamingMediaPlayerTest

- RTSP tests are more vulnerable to network condition, and are flaky.
- Those tests were in known failure list for all releases, so they were not
in public release.

Bug: 6952519, 6952297, 6952295, 6952242
Change-Id: I4466bddd70ecd16380dcbf2a142209c4d199bfd7
rc/android/media/cts/StreamingMediaPlayerTest.java
f6994508aa925e888af24f4adb059a6529a60d9e 10-Oct-2012 Keun young Park <keunyoung@google.com> Merge "nuke MediaPlayerFlakyNetworkTest" into jb-mr1-dev
b1677ec3ffc62cc9ca67e57ce0eeefdd63d20c5d 10-Oct-2012 Keun young Park <keunyoung@google.com> nuke MediaPlayerFlakyNetworkTest

- the test is flaky and no one fixes it.

Bug: 6970592
Change-Id: I3cb5080a72be439b3d820a83ead36ad4165d9fa0
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
6edb217fc67e6f1fb6312bf24906d0eb3f6f9a31 09-Oct-2012 Brian Muramatsu <btmura@google.com> Fix MediaRandomTest watchdog affecting other tests

Bug 6971082

MediaRandomTest fails when the media server crashes, but the watchdog
kicks in later during another test and causes that test to fail.
Thus, make sure to end the watchdog after each test.

10-08 14:41:56.629 2274 2292 I TestRunner: started:
testOnInfoListener(android.media.cts.MediaRecorderTest)
10-08 14:41:59.182 2274 8725 E AndroidRuntime:
junit.framework.AssertionFailedError: Action 11 Param 581451 waited over
5000 ms
10-08 14:41:59.182 2274 8725 E AndroidRuntime: at
junit.framework.Assert.fail(Assert.java:50)
10-08 14:41:59.182 2274 8725 E AndroidRuntime: at
android.media.cts.MediaRandomTest$Watchdog.run(MediaRandomTest.java:141)

Change-Id: I1f956f2c0ab71ee3790b42ff2931b9119878829d
rc/android/media/cts/MediaRandomTest.java
c0ef6f802bbc0d40b1dc8e7cefa360f7434a9299 03-Oct-2012 Keun young Park <keunyoung@google.com> comment out testResourceLeakageTest

- will not be fixed in JB MR1

Change-Id: I094bc1e11021d18e2ae43925f672e005d77137a2
rc/android/media/cts/AudioTrackTest.java
414e010319f617456b091594aa34557f095fa77b 24-Sep-2012 Marco Nelissen <marcone@google.com> Merge "Take volume cap into account in CTS" into jb-mr1-dev
018fdee6227f61b8caa60d17825492b40490303e 24-Sep-2012 Marco Nelissen <marcone@google.com> Take volume cap into account in CTS

Due to new regulations, music sent over a wired headset may be volume limited
until the user explicitly increases the limit, so CTS can't rely on being able
to set the volume to getStreamMaxVolume() in that case.
b/7198289

Change-Id: If4a8cd5778c083f704f448e071be53ccf9b93ef0
rc/android/media/cts/AudioManagerTest.java
b9f6a071a4a8e22aa30fb302994762957d6a8f32 20-Sep-2012 Insun Kang <insun@google.com> Adds a test case for MediaPlayer's deselectTrack().

o Adds a test case named testDeselectTrack().
o Refactors Monitor class and removes redundant SubtitleMonitor.
o Modifies log messages to be more readable.

Bug: 7200096
TESTED=runtest cts-media -c android.media.cts.MediaPlayerTest
TESTED=runtest cts-media -c android.media.cts.MediaPlayerFlakyNetworkTest
TESTED=runtest cts-media -c android.media.cts.StreamingMediaPlayerTest
(Some test cases fails, but those are not regression.)

Change-Id: I6a2847ce7b0188f54357e7ea34ce8f5390c5596e
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
7121e8fea7ba78c0d7dafe49ac80c89c75cfe45f 04-Sep-2012 Keun-young Park <keunyoung@google.com> am 800a7275: am 41406a64: am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev

* commit '800a727505424b371bd25f46a441ed6729b859fc':
Remove optional video encoder: MPEG-4 SP
7aa6ce9f9284ea05c6247dd9a92f1ba4b1ddb1dc 21-Aug-2012 sammi_ms <Sammi_MS@asus.com> Remove optional video encoder: MPEG-4 SP

Change-Id: I5b4594a3cb1d4f5f9bddf25cb8bbce27776c8328
Signed-off-by: sammi_ms <Sammi_MS@asus.com>
rc/android/media/cts/MediaCodecListTest.java
2ead66596c93b82befb4dcc321f5241266254b03 14-Aug-2012 James Dong <jdong@google.com> Add some log message in CamcorderProfileTest

This patch will make the analysis of failure due to unsupported video size much easier

Change-Id: Ifecc4def721500edf9388c2bbef275dc6954f10e
rc/android/media/cts/CamcorderProfileTest.java
0b1b8b03b25e36a608517afe1037c42a4a804c18 09-Aug-2012 James Dong <jdong@google.com> Add a randomized testcase for MediaPlayer.java API methods

Change-Id: I99cac3cbb30110a1393f196b70cd6a066c2f5cc5
rc/android/media/cts/MediaRandomTest.java
0bc18998a7649c3827f84575fa4d862fb0cdd7d9 08-Aug-2012 James Dong <jdong@google.com> Add a randomized testcase on most of the MediaRecorder public methods

o This testcase was mostly based on earlier work by chihchung@google.com
o Handle mediaserver process death using onError callback

Change-Id: I2155dd4e91d6d2212c53825a7e978001455ca808
rc/android/media/cts/MediaRandomTest.java
7b17432324104d5065343d3713208003405683c5 07-Aug-2012 James Dong <jdong@google.com> Improve testSetMaxFileSize testcase in MediaRecorderTest

With this patch, MediaRecorder.setMaxFileSize() is tested with a target file size of 512K, provided
a tolerance of +/- 50K. Such a testcase is very useful for MMS use case where the requested
max file size for recording must be observed.

Change-Id: I839b9434d940ba8d005976024f9a2ea166613cc9
rc/android/media/cts/MediaRecorderTest.java
81015b75adec6e48bc47e048d3e51c8e8b81923c 07-Aug-2012 James Dong <jdong@google.com> Improve testSetMaxDuration testcase in MediaRecorderTest

The old testcase really tests nothing but some file is recorded.
The new testcase will actually enforce the rule that the recorded
file must has a duration +/- one second for a 20-second recording.

Change-Id: I9431bceada79ae47cbbbd43abf5ee4117ede84fd
rc/android/media/cts/MediaRecorderTest.java
8b166f9d6dd1bf22fb1a88e9a86d90967aec35e6 31-Jul-2012 James Dong <jdong@google.com> Added a cts test for retrieving video rotation angle using MediaMetadataRetriever.java API

o related-to-bug: 6872687

Change-Id: I2bbd081c9621e779812e4c7d1fd5cfc6fa7a6354
rc/android/media/cts/MediaPlayerTest.java
721131076b373c3533ebf045110b389766e00511 31-Jul-2012 James Dong <jdong@google.com> Added cts test case for ensuring that MEDIA_INFO_VIDEO_RENDERING_START event is sent for video playback

Change-Id: I50eb375cbbc49f785cf65f9b42009e65db61f70b
rc/android/media/cts/MediaPlayerTestBase.java
42102528a8c3d8dc02b866ef4c7633cf51812656 31-Jul-2012 James Dong <jdong@google.com> Merge "Modify CTS test for subtitle to call selectTrack() after prepare()." into jb-mr1-dev
f74a2a6d74b553c63ff6ba1973d053987eafd8e4 26-Jul-2012 Insun Kang <insun@google.com> Modify CTS test for subtitle to call selectTrack() after prepare().

o selectTrack() API is designed to be called after prepare().

Change-Id: Idd8bc0d803a5309bef63a6e5703064c533436865
(cherry picked from commit 775f97a025724027c0863f6bd88bdef74bef27cc)
rc/android/media/cts/MediaPlayerTest.java
363e6db4f7eb141230183e65a2874e65c483bfcf 28-Jul-2012 James Dong <jdong@google.com> Make sure that MediaPlayer.setVideoScalingMode() gets exercised

o more accurate tests for setVideoScalingMode needs to be done

Change-Id: If848d941ab8a4da5a1aa01023823ea2944cba69b
rc/android/media/cts/MediaPlayerTestBase.java
a38bfde0a247fa39c0cfd73f5b84fb7f9a3a06fd 24-Jul-2012 Keun young Park <keunyoung@google.com> am 6755a6cf: am 1ce5f166: Merge "construct MediaRecorder in setup" into jb-dev

* commit '6755a6cf8f44dc1ff471de8eaa5fb42d7fef1849':
construct MediaRecorder in setup
e65e437b74e25ba1caf0fafb0e144875db9280b1 23-Jul-2012 Keun young Park <keunyoung@google.com> construct MediaRecorder in setup

- it is destroyed in teardown, but not created in setup

Bug: 6469397
Change-Id: I80ac4e2d4ba3eeacc333cd5f60ff57172007f08c
rc/android/media/cts/MediaRecorderTest.java
b393e70e82809945df0c3d07c9aae3dc81fa173d 06-Jul-2012 Insun Kang <insun@google.com> Adds CTS test case for timed text APIs into MediaPlayerTest.

Change-Id: I0f5584a0e8bd7834411e0c2de459ab27af197235
es/raw/test_subtitle1_srt.3gp
es/raw/test_subtitle2_srt.3gp
es/raw/testvideo_with_2_subtitles.3gp
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
41f3a52baf75712f5aa8d7a8f21c4bbb4d34279e 20-Jul-2012 Keun young Park <keunyoung@google.com> am 3ad86159: am 8a23898b: Merge "refactor MediaPlayerTest" into jb-dev

* commit '3ad861591649763d8e59a9d57a15827d39c1fbee':
refactor MediaPlayerTest
88753982317a5cc67dbaa17a069ebd2821c0e208 20-Jul-2012 Keun young Park <keunyoung@google.com> refactor MediaPlayerTest

- recycle MediaPlayer in setUp/tearDown
- rename output file to prevent influence to MediaRecorderTest

Change-Id: I7438e3b02c2febace89f36369af91f5305e6bd9c
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
c2b49eb28939ea2ceef50741111bd3c46711f6ed 20-Jul-2012 Keun young Park <keunyoung@google.com> am 41f3b997: am 3fdddac0: Merge "close file stuffs before deleted in teardown" into jb-dev

* commit '41f3b99798e94c6752d5b47bc6140851aa963cb6':
close file stuffs before deleted in teardown
0f9d299f52167bd68025fc39174be922e92e9635 19-Jul-2012 Keun young Park <keunyoung@google.com> close file stuffs before deleted in teardown

- FileStream and MediaMetadataRetriever

Change-Id: I26e903254069e8a875806420f102e5a7078dbd60
rc/android/media/cts/MediaRecorderTest.java
982242350c69a36b3d76a5fd06f5a7cb4e13f712 17-Jul-2012 James Dong <jdong@google.com> am 2484880f: am f631c6f3: Merge "Add new MediaCodecList/MediaCodecInfo cts test cases" into jb-dev

* commit '2484880f9f22a54a0117f057bf696fc637d599e1':
Add new MediaCodecList/MediaCodecInfo cts test cases
da4890f2dd6b8e534752c00cb2a41a8de0082e25 13-Jul-2012 James Dong <jdong@google.com> Add new MediaCodecList/MediaCodecInfo cts test cases

Change-Id: I5821e25e62294429b289d43f3e745598bde634ed
related-to-bug: 6787502
rc/android/media/cts/MediaCodecListTest.java
3c0af16332beeae6feed84e209d25edd9e05fb02 12-Jul-2012 Keun young Park <keunyoung@google.com> resolved conflicts for merge of 5feccd32 to master

Change-Id: I11f302fa4bf45c4d08b1107e5fb3255695f54192
a06798f0353bb360e8d4067140586cd236ce024d 12-Jul-2012 Keun young Park <keunyoung@google.com> change testRunner to CtsTestRunner

- unlock keyguard by default

Change-Id: I0452a72cfa54edfa79b485894ffd0493a71122ee
ndroid.mk
ndroidManifest.xml
f694e4eb5bcb69d4b2f3710322e9f261f3544bd0 11-Jul-2012 Keun young Park <keunyoung@google.com> am ac7c7420: am ca46048c: trial to fix MediaRecorderTest error

* commit 'ac7c74208925b87ce1408a36b871e3a8dbf37a42':
trial to fix MediaRecorderTest error
ca46048c4945d53263b4fba9c55dcb62351251de 10-Jul-2012 Keun young Park <keunyoung@google.com> trial to fix MediaRecorderTest error

- activity is not guaranteed to be ready before MediaRecorder is accessed.

Change-Id: I85beda3fd2bb7a3715554653ad44e3e76f99f4b8
rc/android/media/cts/MediaRecorderTest.java
66cabbc7307a35ac92a0f902b656466f9200ed28 09-Jul-2012 James Dong <jdong@google.com> am f7960dfe: am 66c81537: Merge "We really should make method MediaRecorderTest.recordVideoUsingCamera() private" into jb-dev

* commit 'f7960dfeea89ffbc4c40638878f9be47f9e54cb1':
We really should make method MediaRecorderTest.recordVideoUsingCamera() private
66c815373d9571806b2f8aac6101f4bbdf4d9bfc 09-Jul-2012 James Dong <jdong@google.com> Merge "We really should make method MediaRecorderTest.recordVideoUsingCamera() private" into jb-dev
724be2e03831481cd6a80650385acff3f6dc83e8 04-Jul-2012 Keun young Park <keunyoung@google.com> am 0ced9d3c: am cbe0ae2b: Merge "reduce delay even further: 1 to 1.5 sec as failure still happened" into jb-dev

* commit '0ced9d3c583e6b955e82694117263f9a06181a32':
reduce delay even further: 1 to 1.5 sec as failure still happened
cbe0ae2b3649cedd8615cee43a03cb4fedfb967d 04-Jul-2012 Keun young Park <keunyoung@google.com> Merge "reduce delay even further: 1 to 1.5 sec as failure still happened" into jb-dev
cebfae830fb1dbaf3082731851a0f8c0afb1555b 04-Jul-2012 Keun young Park <keunyoung@google.com> reduce delay even further: 1 to 1.5 sec as failure still happened

Change-Id: I2f52ce8a082c6e5c8e74fcfeed81ad52f16519b4
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
ab68831bd093317d75a99094526cce47d9479f22 04-Jul-2012 James Dong <jdong@google.com> We really should make method MediaRecorderTest.recordVideoUsingCamera() private

Change-Id: Ie2f1b81184700854061d90d1bbb6734678ea2805
related-to-bug: 6425402
rc/android/media/cts/MediaRecorderTest.java
b6d1cc0b513a18e6978e3a6fc6469465cb6a9e1c 04-Jul-2012 James Dong <jdong@google.com> am f265a96c: am e012e2ab: Fix an issue with MediaRecorderTest

* commit 'f265a96c1c5bdc2577b26a325682b5ebccca349a':
Fix an issue with MediaRecorderTest
e012e2abe7d829daace218e2a284766eea5e9613 04-Jul-2012 James Dong <jdong@google.com> Fix an issue with MediaRecorderTest

The max duration in the test was too short (200ms) to be respected.
Inceasse the max duration to 2 seconds.

Change-Id: Ia0de268a4fa89e4cd878f7611da94f0fb885ac89
related-to-bug: 6425402
rc/android/media/cts/MediaRecorderTest.java
9f2bed3a18fc627bf9514426d12042e2c91c2f4d 03-Jul-2012 Keun young Park <keunyoung@google.com> am 33643904: am 8f6e76b4: add debugging message to fix MediaRecorderTest.testOnErrorListener

* commit '3364390476b5a9568603f64fb9478ed067955c12':
add debugging message to fix MediaRecorderTest.testOnErrorListener
8f6e76b4ffd794822f4528eb41bf60a40b7e5783 03-Jul-2012 Keun young Park <keunyoung@google.com> add debugging message to fix MediaRecorderTest.testOnErrorListener

- no clear understanding yet. activity paused in the middle which causes test failure.
- start activity before calling MediaRecorder APIs

Bug: 6469397
Change-Id: I0837d40c54e4aa8d95c1014b913f37dd3b018c65
rc/android/media/cts/MediaRecorderTest.java
rc/android/media/cts/MediaStubActivity.java
910343f075e8a74c2d7370b37101a5b7b42ffad9 02-Jul-2012 Keun young Park <keunyoung@google.com> am ae453002: am 4ceaa3c0: reduce possible delay from 1 to 6 secs to 1 to 2.5 secs

* commit 'ae45300206572f0b154c5d8f11eb695f09c126b7':
reduce possible delay from 1 to 6 secs to 1 to 2.5 secs
4ceaa3c09d362171e10c85bec3980c55ecb9a6ea 02-Jul-2012 Keun young Park <keunyoung@google.com> reduce possible delay from 1 to 6 secs to 1 to 2.5 secs

- should restore to 1 to 6 once public API for checking time-out is added.

Bug: 6763056
Change-Id: I017cae3f4aa3a7b933f617227f8336f141705c6a
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
8fdfc653ff74c5cb03722f165db608b9f63be978 02-Jul-2012 Eric Laurent <elaurent@google.com> am 7dd2e866: am 04194a3f: Merge "More threading issues fixed in audio effect tests" into jb-dev

* commit '7dd2e86629e8f4c998bdaf3cd9e1f5c803addba2':
More threading issues fixed in audio effect tests
dd778ec145ad3625750acc4bd0e9f2cfaa5678f3 02-Jul-2012 Eric Laurent <elaurent@google.com> More threading issues fixed in audio effect tests

Fixed synchonizaion issues in Equalizer, BassBoost, Virtualizer,
Reverb and Visualizer listener tests.

Change-Id: I58a3c5d2ef6679eb3912e06495140d60edbdbfc6
rc/android/media/cts/BassBoostTest.java
rc/android/media/cts/EnvReverbTest.java
rc/android/media/cts/EqualizerTest.java
rc/android/media/cts/PresetReverbTest.java
rc/android/media/cts/VirtualizerTest.java
rc/android/media/cts/VisualizerTest.java
bf9117f7ec29ff67a2181982115918f50423b3a1 01-Jul-2012 Keun young Park <keunyoung@google.com> am 80310000: am 517c6af5: Merge "add missing assets for StreamingMediaPlayerTest" into jb-dev

* commit '80310000e046fe78c4acc2fe638314d010f88b20':
add missing assets for StreamingMediaPlayerTest
517c6af5f65bd79faa199fecac70d4ca7a1a4da7 01-Jul-2012 Keun young Park <keunyoung@google.com> Merge "add missing assets for StreamingMediaPlayerTest" into jb-dev
8c0893dce75ab61e66d09175b5eca9ea3fefa2a4 01-Jul-2012 Eric Laurent <elaurent@google.com> am edabf48c: am 904d4063: Fix AudioEffect.test4_3EnableStatusListener()

* commit 'edabf48cc243191bf2e79edbe7a10c29e4c3ac30':
Fix AudioEffect.test4_3EnableStatusListener()
f3d6f5c9e0fb5d34bf52dfc69d412a48a761820d 30-Jun-2012 Keun young Park <keunyoung@google.com> add missing assets for StreamingMediaPlayerTest

- somehow these were not included in the refactoring CL and makes StreamingMediaPlayerTest fail.

Change-Id: Ic737d9e6eac96d9a13f0846dab192b2d9eef9ca3
ssets/noiseandchirps.mp3
ssets/noiseandchirps.ogg
ssets/ringer.mp3
904d406361872b5831a16bb2e0769f77ca19741f 30-Jun-2012 Eric Laurent <elaurent@google.com> Fix AudioEffect.test4_3EnableStatusListener()

The intermitent problem is likely due to a multi theading
issue where the main test thread does not properly wait for the listener
thread to be initialized before proceeding.

This CL fixes the synchonization between the two trheads.

Bug 6303417.

Change-Id: I5a2d736e8e63a27e3f61db2aa4c1149d51bebcdc
rc/android/media/cts/AudioEffectTest.java
6d0b522a41aff1614fbc92b995caff99de1428f0 29-Jun-2012 Eric Laurent <elaurent@google.com> am 2950e431: am 24741608: Merge "AudioManagerTest: fix testVolume." into jb-dev

* commit '2950e4313b8a1d276cf165683940e89309d99902':
AudioManagerTest: fix testVolume.
24741608f6bcb61a930797c59ce633857fc7e61e 29-Jun-2012 Eric Laurent <elaurent@google.com> Merge "AudioManagerTest: fix testVolume." into jb-dev
379e2b782b09a328e95ee2a6645dcba4d4c31639 29-Jun-2012 Keun young Park <keunyoung@google.com> am d4c4f284: am 260e3abf: fix missing rename from cts.stub to cts.media

* commit 'd4c4f28433f8561e5a43be70fa51ef1f16907749':
fix missing rename from cts.stub to cts.media
260e3abfa6e2d347bcb3b1ed9d154ff402ad327f 29-Jun-2012 Keun young Park <keunyoung@google.com> fix missing rename from cts.stub to cts.media

Change-Id: I030fe9aeaaa36c88e4a70279ae8d81def3409804
rc/android/media/cts/MediaPlayerSurfaceTest.java
rc/android/media/cts/MediaRecorderTest.java
rc/android/media/cts/RingtoneManagerTest.java
2c429e29c452ebd462cfed2a113aa29f7e8d0d75 29-Jun-2012 Keun young Park <keunyoung@google.com> am 0f6a8b83: am 5345f4c9: Merge "move activities for media to media package" into jb-dev

* commit '0f6a8b8309f78f15b330f7dd776cfbdf263aac36':
move activities for media to media package
ab4c4561009a359103f8794c0f070f6f8e8a29d3 29-Jun-2012 Eric Laurent <elaurent@google.com> AudioManagerTest: fix testVolume.

New volume policy makes that STREAM_SYSTEM is tied to STREAM_RING.

As applications should not change STREAM_SYSTEM volume anyway, removing it
from the list of tested stream types.

Bug 6421825.

Change-Id: I3cf9452d08da0628c0318bf76e325270ed422d4d
rc/android/media/cts/AudioManagerTest.java
e351eb0f4090dbe7f2cb97c227758d0e161be9c3 28-Jun-2012 Keun young Park <keunyoung@google.com> move activities for media to media package

- move some common code to libs/util
- move resource
- some resources are duplicated as used by other components

Change-Id: Ief4636b2f095628906dc40b56329f4103ee5a501
ndroid.mk
ndroidManifest.xml
es/drawable/faces.jpg
es/drawable/single_face.jpg
es/layout/mediaplayer.xml
es/raw/a_4.ogg
es/raw/a_4_aac.mp4
es/raw/b_5.ogg
es/raw/b_5_aac.mp4
es/raw/c_sharp_5.ogg
es/raw/c_sharp_5_aac.mp4
es/raw/e_5.ogg
es/raw/e_5_aac.mp4
es/raw/g_sharp_5.ogg
es/raw/g_sharp_5_aac.mp4
es/raw/john_cage.ogg
es/raw/monodcneg.mp3
es/raw/monodcpos.mp3
es/raw/mononoisedcpos.m4a
es/raw/playlist1.pls
es/raw/playlist2.m3u
es/raw/sine1320hz5sec.wav
es/raw/sinesweepflac.flac
es/raw/sinesweepm4a.m4a
es/raw/sinesweepmp3lame.mp3
es/raw/sinesweepmp3smpb.mp3
es/raw/sinesweepogg.ogg
es/raw/sinesweepraw.raw
es/raw/sinesweepwav.wav
es/raw/stereonoisedcpos.m4a
es/raw/test_jet.jet
es/raw/testmp3.mp3
es/raw/testmp3_2.mp3
es/raw/testvideo.3gp
es/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_12fps_aac_mono_24kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_12fps_aac_stereo_24kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_25fps_aac_mono_24kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_24kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_12fps_aac_mono_24kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_24kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_128kbps_22050hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_11025hz.3gp
es/raw/video_176x144_3gp_h263_56kbps_25fps_aac_stereo_24kbps_22050hz.3gp
es/raw/video_480x360_mp4_h264_1000kbps_25fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_480x360_mp4_h264_1000kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_480x360_mp4_h264_1350kbps_25fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz.mp4
es/raw/video_480x360_mp4_h264_500kbps_25fps_aac_stereo_128kbps_44100hz.mp4
es/raw/video_480x360_mp4_h264_500kbps_30fps_aac_stereo_128kbps_44100hz.mp4
rc/android/media/cts/AudioEffectTest.java
rc/android/media/cts/AudioManagerStub.java
rc/android/media/cts/AudioManagerStubHelper.java
rc/android/media/cts/AudioManagerTest.java
rc/android/media/cts/AudioPreProcessingTest.java
rc/android/media/cts/DecoderTest.java
rc/android/media/cts/FaceDetectorStub.java
rc/android/media/cts/FaceDetectorTest.java
rc/android/media/cts/FaceDetector_FaceTest.java
rc/android/media/cts/FaceView.java
rc/android/media/cts/JetPlayerTest.java
rc/android/media/cts/MediaPlayerSurfaceStubActivity.java
rc/android/media/cts/MediaPlayerSurfaceTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaScannerConnectionTest.java
rc/android/media/cts/MediaScannerTest.java
rc/android/media/cts/MediaStubActivity.java
rc/android/media/cts/RingtoneManagerTest.java
rc/android/media/cts/RingtonePickerActivity.java
rc/android/media/cts/SoundPoolAacTest.java
rc/android/media/cts/SoundPoolOggTest.java
rc/android/media/cts/SoundPoolTest.java
rc/android/media/cts/VideoEditorTest.java
rc/android/media/cts/VideoSurfaceView.java
88c31756586d98adebfd3ac1a3ade299d55f8878 26-Jun-2012 Keun young Park <keunyoung@google.com> add test to detect resource leakage in audioflinger

- at the moment, the test fails at the 2nd round

Change-Id: Ib89cbbc84dc8d4e49dbb217ff826457984ca52f2
rc/android/media/cts/AudioTrackTest.java
fda4cc82f90532f15ea50094aa02fb9200aa517f 25-Jun-2012 Keun young Park <keunyoung@google.com> merge AOSP changes: media and graphics

Change-Id: I0feb091a199a34f8b5a10d8118b0f2b334c0ce6e
rc/android/media/cts/MediaPlayerTest.java
bc629c90a24cd36a75b77bbe1a9947d958a529f7 22-Jun-2012 Keun young Park <keunyoung@google.com> am 54dc772f: Merge "trial fix for MediaRecorderTest.testOnErrorListener" into jb-dev

* commit '54dc772f0501dcf6b9375fd48357272ecb290b74':
trial fix for MediaRecorderTest.testOnErrorListener
c5e6546b092588ea160194b01358e9a24f113aa0 22-Jun-2012 Keun young Park <keunyoung@google.com> trial fix for MediaRecorderTest.testOnErrorListener

- add delay before checking file length. may not fix.

Bug: 6469397
Change-Id: Ib13ab52f59f39de145576a438b65d496051a7e52
rc/android/media/cts/MediaRecorderTest.java
3bd7abb35a94dc562e79c7e2fdfb6ebdb6e7b317 20-Jun-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 2e238870 to jb-dev-plus-aosp

Change-Id: Ic892cc95cc24c731618c0aff5d10ce896e67edc4
143cafe688c3e9f32607838ada31495c444077a6 14-Jun-2012 Kiran Kumar K <a16651@motorola.com> MediaPlayertest#testVideoSurfaceResetting :
Change the Tolerance value back to original 150 msecs as that covers
vast range of devices with varying audio latency range.

Change-Id: I48a17ba69bbf5bce75129317d88ae3b32a45217a
rc/android/media/cts/MediaPlayerTest.java
cf1d115f9120111a2bd9b41306fac51588a153d7 15-Jun-2012 Eric Laurent <elaurent@google.com> Revert "Fix AudioManager.testRouting()."

This reverts commit 64e22d783e2d7ad2dc2b3238c4572f59873d8d05.
rc/android/media/cts/AudioManagerTest.java
2a1e521fe8644d6cb3f90b26bf04c0eddbc3cdc2 13-Jun-2012 Eric Laurent <elaurent@google.com> fix AudioTrack testPlaybackHeadPositionAfterStop()

Allow a longer time before AudioTrack position returns
to 0 after stop to allow for longer audio latencies.

Change-Id: Ic5edc9f86c7def3487727da00286d6b85b358f92
rc/android/media/cts/AudioTrackTest.java
0dbe847037fc266152965a6ca3d4645036f9ef2e 04-Jun-2012 Eric Laurent <elaurent@google.com> Merge "Fix AudioManager.testRouting()." into jb-dev
64e22d783e2d7ad2dc2b3238c4572f59873d8d05 04-Jun-2012 Eric Laurent <elaurent@google.com> Fix AudioManager.testRouting().

AudioManager.setBluetoothA2dpOn() is still deprecated but
AudioManager.isBluetoothA2dpOn() now returns the last value set.

Bug 6572651.

Change-Id: If4947a53e184f126c2010d98af4d312192057638
rc/android/media/cts/AudioManagerTest.java
b209dd7a65e3a7166cbb1f55980a4fc7a701c212 04-Jun-2012 Marco Nelissen <marcone@google.com> Fix copy/paste error

Change-Id: I79ec4454c9a383d301e071dfcfb322ad5f2c64dd
rc/android/media/cts/MediaPlayerTest.java
95d56424ce517bf3d67c8a575d66f533effe3463 01-Jun-2012 Marco Nelissen <marcone@google.com> Merge "Retry flaky tests" into jb-dev
25b80346d323bde44db1538cae9862e187e7d4d1 01-Jun-2012 Marco Nelissen <marcone@google.com> Retry flaky tests

The gapless playback tests are based on a visualization effect, which isn't
very accurate and so may fail sometimes. Retrying the test helps make CTS
more stable.
b/6421832

Change-Id: I3d7d65fe77b46499066759dbec2bd57704e8e1ca
rc/android/media/cts/MediaPlayerTest.java
8354f8d57525ab8a636c023a7c517c8947f9c739 01-Jun-2012 Brian Muramatsu <btmura@google.com> Increase MediaScanner test timeouts

Raise from 2 to 10 secs.

Bug 6576677

Change-Id: Ia4a16a2a89d0b0ef2e68b78e8ffb8b453a93e6ac
rc/android/media/cts/MediaScannerConnectionTest.java
rc/android/media/cts/MediaScannerTest.java
3960f9444be8bd01bdbd0b9131b6bdc86dd54d66 23-May-2012 Marco Nelissen <marcone@google.com> Add media provider/scanner tests

Tests to detect mishandling of sqlite wildcards in paths.
b/6501408

Change-Id: I76e7062c96aa501e0a014369915ab850c0439bea
rc/android/media/cts/MediaScannerTest.java
1ffdbd3094797bea4efcacbc42a935e444e9c77b 15-May-2012 Eric Laurent <elaurent@google.com> Fix AudioManager tests.

Expect different results from vibrator test depending on the
presence of a vibrator.

Adapt volume tests to new volume policy.

Bug 6469653.

Change-Id: I743b9f4ef0effda1576e451adacac1c9528e1ba7
rc/android/media/cts/AudioManagerTest.java
75e1987c7d4c53eb77fc440e973421c5192a19b6 09-May-2012 Eric Laurent <elaurent@google.com> Fix AudioManagerTest.testVolume()

This test was broken by commit 45c90cef: now VolumePanel forces the stream type
controlled by adjustSuggestedStreamVolume() even from other processes.

The test should not specify FLAG_SHOW_UI so that VolumePanel is not displayed.

Issue 6418771.

Change-Id: Ib6eb53e6e3262fbbe301ca485a1018c80200e0fd
rc/android/media/cts/AudioManagerTest.java
a76e8dcda9aa3ea020cebaa68646ad6db87b30c8 08-May-2012 Andreas Huber <andih@google.com> Now that MediaCodec marks buffers as having host endianness remove obsolete code.

Change-Id: If9b1779b0a4d23728059a16bfbd4f5ba685436a6
rc/android/media/cts/DecoderTest.java
bc1e1260024df78af8fb02c3bc0045fbcfa5d3d8 08-May-2012 Andreas Huber <andih@google.com> MediaCodec now submits codec specific data automatically

if it's included in the format passed to MediaCodec.configure().

Change-Id: Ia784a7fab5ec0f507d8cd170ef98fd4f109f0f68
related-to-bug: 6364139
rc/android/media/cts/DecoderTest.java
00215eeabbf657aadb99e8a60e73beaf79aed617 04-May-2012 Andreas Huber <andih@google.com> Merge "Adjust to API changes requested by the api-council." into jb-dev
bf132da949091a5739e999e86a1e6fd0dd2fa011 03-May-2012 Marco Nelissen <marcone@google.com> Merge "Ensure test works on silenced device" into jb-dev
0eb4d6b707ffea02d9e1025c93cd005af25657df 03-May-2012 Andreas Huber <andih@google.com> Adjust to API changes requested by the api-council.

Change-Id: I87d2ccb74fe4814fc281e05423a155d376696198
rc/android/media/cts/DecoderTest.java
4ab9590ec3b0775979312e6c49951d22a9dc0df1 03-May-2012 Marco Nelissen <marcone@google.com> Ensure test works on silenced device

When ro.audio.silent is set (as it is in the test lab), we need to
make sure audio is muted after the visualizer, not before.
b/6421638

Change-Id: I290fd65de54894a0a631de53b0b73138e23d0d9e
rc/android/media/cts/MediaPlayerTest.java
f9053ac6f92d568a5a2a79e55ad6e0c0a96088c1 02-May-2012 Brian Muramatsu <btmura@google.com> Fix StreamingMediaPlayerTest

Bug 6293020

NuPlayer will send (0, 0) as the first on size changed.

Change-Id: I1e54d4162994d1d81e1e8d10c633e934b0f4516e
rc/android/media/cts/MediaPlayerTestBase.java
88c0f6669d53ac4698ffaee8f4dea4f40e527ee8 30-Apr-2012 Marco Nelissen <marcone@google.com> CTS test for java codec APIs

Currently this mostly tests whether the decoded data matches the original data close enough.
b/774846

Change-Id: I6fd05a037ac2d1f5f6d4262c3084f7e37313be1c
rc/android/media/cts/DecoderTest.java
961d1f275532c77df4793b6a82463ae9392a75ec 27-Apr-2012 Eric Laurent <elaurent@google.com> fix MediaPlayerTest.testVideoSurfaceResetting()

The tolerance used to check the position after seek was not taking the
variability of audio latency into account.

Change-Id: Id605233342bb6ae75fa3f48e6cefb93237a49752
rc/android/media/cts/MediaPlayerTest.java
5306fa4d3f43fbe546a2b28ed799e488fab894ba 27-Apr-2012 Marco Nelissen <marcone@google.com> Fix/expand gapless test

Fix a bug in the previous test (it was using the same file twice,
instead of using the both the positive/negative DC offset files), add
a similar test for m4a files, run at reduced volume, and automatically
adjust the test interval to the length of the files.

Change-Id: Ib421ec3d907daa52656b8dabe7fc4b6dabf401b6
rc/android/media/cts/MediaPlayerTest.java
bfdf2a4bd90b32898b3c1ebd36d12e4e6550890b 10-Apr-2012 Eric Laurent <elaurent@google.com> added cts tests for audio preprocessing

Added cts tests for noise suppressor, acoustic echo canceler and
automatic gain control.

The APIs for these audio pre processing effects are simple and we just need to
test that creating and enabling/disabling the effect works.
These effects are not mandatory and the test shall pass if they are not avaible
on the tested platform.

Change-Id: Ice8f1dd43733d14dd0bd204628c8ddee6f21e044
rc/android/media/cts/AudioPreProcessingTest.java
678ed973b614c9e717aaf7b6c3f11962860d317a 18-Apr-2012 Brian Muramatsu <btmura@google.com> Merge "Fix for MediaPlayerTest#testGapless"
3cb44ac078237526d4ad54d0da5caff7d43ddeb4 18-Apr-2012 Brian Muramatsu <btmura@google.com> Fix for MediaPlayerTest#testGapless

Bug 6288094

Ringer mode has to be taken out of silent.

Change-Id: I33f12eda84ae9bc7158306c3b7e186ac5fdee7a5
rc/android/media/cts/MediaPlayerTest.java
02161c35f4c5c508676562d53f3562701fe8bf16 18-Apr-2012 Brian Muramatsu <btmura@google.com> Fix MediaPlayerTest#testPlayNullSource

Bug 6346381

Expect that a null source will be rejected somehow.

Change-Id: I50e90559aa0ed779cb9fbd561710648922062bd9
rc/android/media/cts/MediaPlayerTest.java
08178efb3c972957b9bea72f5c8186502affd7be 05-Apr-2012 Brian Muramatsu <btmura@google.com> Merge "Fix MediaPlayerFlakyNetworkTest NPE"
2e0a6bb2cd4bd63a7653f2d33f04eb88e89713ad 05-Apr-2012 Marco Nelissen <marcone@google.com> Turn up volume before running gapless test

If the volume is turned down, the test will fail.
b/6288094

Change-Id: I1a2ae4806e6ee7a18787d4dcb650ce37170bb207
rc/android/media/cts/MediaPlayerTest.java
a81bcd66ed388a8e7bdb87cd7c665532f808615d 05-Apr-2012 Brian Muramatsu <btmura@google.com> Fix MediaPlayerFlakyNetworkTest NPE

Bug 6288085

MediaPlayerFlakyNetworkTest sets mMediaPlayer to null so just check
whether its null before releasing.

Change-Id: I6fe00d7ccc155db98539aaf91a0f84da459b4e05
rc/android/media/cts/MediaPlayerTestBase.java
6edd2ea41a5382063a5d48e5c4d852b48de3e26f 26-Mar-2012 Marco Nelissen <marcone@google.com> Add CTS test for gapless playback

Test will fail if playback of two consecutive files has a gap between them or
overlaps the two files.

Change-Id: Icdb268c8cbca2b5868841bece48adf0e4dc185f4
rc/android/media/cts/MediaPlayerTest.java
f40c91feeff40dbb0afa4b6c6b8d1dfb90c381e5 23-Mar-2012 Marco Nelissen <marcone@google.com> Add test for MediaPlayer.setNextMediaPlayer

Change-Id: I22bc0cbf5be56aa0d3fb2eb41ba34d5fee96c5cf
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
63f3e56edd82c825715e1e1e084b76adb9e2a1d9 21-Mar-2012 Brian Muramatsu <btmura@google.com> am 5b91f942: am 1abbd957: am 33876172: Rename MediaPlayerStreamingTest

* commit '5b91f942fc7b486e45492b71a38177274d184e11':
Rename MediaPlayerStreamingTest
338761727cc9d31006799ac20dea186697170da1 19-Mar-2012 Brian Muramatsu <btmura@google.com> Rename MediaPlayerStreamingTest

When MPST brings down the media server, the Ringtone tests end up
failing when trying to load ringtone resources in the setUp method.
Renaming MPST to SMPT so that it occurs after the Ringtone tests,
so that the Ringtone tests don't fail and raise concern.

Change-Id: I2a93a698f441c510bd71206fc3bcc4089825f308
rc/android/media/cts/MediaPlayerStreamingTest.java
rc/android/media/cts/StreamingMediaPlayerTest.java
2412d31883641b980d46938f7254fc991bbe63ba 15-Mar-2012 James Dong <jdong@google.com> Fixed an incorrect test case where MediaPlayer.start() was called right after MediaPlayer.stop() was called.

I also changed the test case so that it becomes more interesting:
1) video plays on surface A.
2) switch to use surface B.
3) switch to use a null surface.
4) switch back to use surface A.

o related-to-bug: 6158159

Change-Id: I2f5f9ad4077017c37ab4912c9cea48c3e7020621
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
e22aa42bc23f93688109d9e7a789d9efcff800d0 15-Mar-2012 James Dong <jdong@google.com> Fixed an incorrect test case where MediaPlayer.start() was called right after MediaPlayer.stop() was called.

I also changed the test case so that it becomes more interesting:
1) video plays on surface A.
2) switch to use surface B.
3) switch to use a null surface.
4) switch back to use surface A.

o related-to-bug: 6158159

Change-Id: I2f5f9ad4077017c37ab4912c9cea48c3e7020621
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
82bba39333aec234d5350cdacdfdeeb8242e1150 24-Feb-2012 James Dong <jdong@google.com> Merge "Improved test cases in MediaRecorderTest.java"
fee1d0aa61f61ee45c2ecc403d34d1ae21edc945 23-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge 34344179

Change-Id: I0b2e27ec88b5c4616c5def77779b7242a35e8329
6e6f1d29373d01099c33d5b12cb611cc14e96e7f 22-Feb-2012 James Dong <jdong@google.com> Improved test cases in MediaRecorderTest.java

o made sure that no audio is recorded for timelapse video recording
o made sure that the video duration is expected
o checked on the expected auido/video tracks

Change-Id: Ie96b45b9303fad5c68898716b33d07d6db22261c
rc/android/media/cts/MediaRecorderTest.java
1f8528cd5b3012d0f0cd8b04399f019daae94ea2 18-Feb-2012 Brian Muramatsu <btmura@google.com> Merge "MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting" into ics-mr1
c37a996d9e09df132f75d5e6d90b3d3f53add359 15-Feb-2012 Gabriel M. Beddingfield <gabrbedd@ti.com> MediaPlayerTest: Improve timestamp logic in testVideoSurfaceResetting

In android.media.cts.MediaPlayerTest#testVideoSurfaceResetting, the
code was assuming that:

1. The media position does not updated between invocations of
MediaPlayer.getCurrentPosition and MediaPlayer.setDisplay().

2. Seeks happen immediately.

These are both false assumptions.

This patch sets a tolerance when comparing the results of
getCurrentPosition(). The tolerance is set to the time for 1.5 frames
of a 15 fps video to elapse.

This patch also waits for the seek complete signal from the media
before continuing with the test. As a consequence, it is able to use
a lower tolerance when comparing the results after the seek.

Change-Id: I528577b5b92162b4c1a1ba81af801846bacd89d2
Signed-off-by: Gabriel M. Beddingfield <gabrbedd@ti.com>
rc/android/media/cts/MediaPlayerTest.java
544471f00fb6d67ace41c6e0f1503158508ea676 13-Feb-2012 James Dong <jdong@google.com> Merge "added a test case for time-lapse video recording"
985b9b681bcc239abb0f71c2993d1725b482d660 13-Feb-2012 Keun young Park <keunyoung@google.com> am f9df8ed8: am 7338ce52: am b9db9bb8: Merge "increase retry to have better chance for streaming" into ics-mr1

* commit 'f9df8ed80c1910d510fd1ca2d3e2b740719fd16e':
increase retry to have better chance for streaming
c17394e09d16852a69bfed62977f665abfdf51b4 10-Feb-2012 James Dong <jdong@google.com> added a test case for time-lapse video recording

Change-Id: I899fbbadcd8b290aca5b9640ad66c7f9cb9bf0f1
rc/android/media/cts/MediaRecorderTest.java
12f55d2ce2b363b7f4f3298ef0bbb44bc9b4c54f 09-Feb-2012 James Dong <jdong@google.com> Added more test coverage and a test case for MediaRecorderTest.java

o excercised calls to the following public methods in the MediaRecorder.java class:
+ setAudioChannels(),
+ setAudioSamplingRate(),
+ setAudioEncodingBitRate()
+ setVideoEncodingBitRate()
+ getAudioSourceMax()

Change-Id: Ibaefc021e1d7a242ddcb01f71155a97c72285747
rc/android/media/cts/MediaRecorderTest.java
62c5f2807700e62a2c4eea2f05a80ff530c940ef 08-Feb-2012 Keun young Park <keunyoung@google.com> increase retry to have better chance for streaming

Change-Id: I1fbd0b4f7d916ab7eebf5ce07c1ff8df21a518b7
rc/android/media/cts/MediaPlayerTestBase.java
9fd1fddb73ec9ea82515b4276b18bd3f773da0f5 07-Feb-2012 James Dong <jdong@google.com> add a new cts test for MediaRecorder.setOrientationHint()

o related-to-bug: 5088443

Change-Id: I283fccd8cb77e3fae515c602561cd6d679a763cc
rc/android/media/cts/MediaPlayerTest.java
6409c18be93a30d3ea8a5893c074682931dc2d9e 04-Feb-2012 James Dong <jdong@google.com> Add some cts tests for raw audio file formats: AMR_NB, AMR_WB and AAC_ADTS

Change-Id: Ifa4d6a7f7d7580eb7d4796f1d285e864fe02875b
rc/android/media/cts/MediaRecorderTest.java
f78a3331d5264c533ece7b69309a0e9a387b4285 02-Feb-2012 Marco Nelissen <marcone@google.com> More mediascanner tests

Tests that playlist parsing (pls and m3u) works even when the media
scanner uses bulk inserts.

Change-Id: I8ea7bb3eb8cdd45a8372e99d4554d953bededd54
rc/android/media/cts/MediaScannerTest.java
6f48426620c61b34588903eff6e326361667468a 01-Feb-2012 Marco Nelissen <marcone@google.com> Remove unnecessary copy of media resource.

there is one in ./tests/res/raw/john_cage.ogg already

Change-Id: I91ad577b740bdf8853edeb2304088faad453d3e2
es/raw/john_cage.ogg
1f0afdf186b0ebd6da7a8642173f82f9fd106c6b 31-Jan-2012 Marco Nelissen <marcone@google.com> Add test to verify that adding and removing a nomedia file is handled correctly.

Also refactor some of the other tests to make use of new utility classes

Change-Id: Ib8ea168a88fc8688ecf4bf9143947ea3ed290ef5
rc/android/media/cts/MediaScannerConnectionTest.java
rc/android/media/cts/MediaScannerNotificationTest.java
rc/android/media/cts/MediaScannerTest.java
rc/android/media/cts/ScannerNotificationReceiver.java
e86ece2b76ccdf1d515b13018dd7c49241055ee3 26-Jan-2012 Brian Muramatsu <btmura@google.com> Remove Test Annotations

These annotations are not being parsed by any program.
Also they are distracting to readers and are painful to
maintain. Furthermore, they prevent us from adding the
LOCAL_SDK_CURRENT clause to Makefiles which is useful
to detect and stop us from using private APIs.

Change-Id: Id93b3a80c73df808c342e489f1434261f288204c
rc/android/media/cts/AsyncPlayerTest.java
rc/android/media/cts/AudioEffectTest.java
rc/android/media/cts/AudioManagerTest.java
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
rc/android/media/cts/BassBoostTest.java
rc/android/media/cts/CamcorderProfileTest.java
rc/android/media/cts/CameraProfileTest.java
rc/android/media/cts/EnvReverbTest.java
rc/android/media/cts/EqualizerTest.java
rc/android/media/cts/FaceDetectorTest.java
rc/android/media/cts/FaceDetector_FaceTest.java
rc/android/media/cts/JetPlayerTest.java
rc/android/media/cts/MediaRecorderTest.java
rc/android/media/cts/MediaScannerConnectionTest.java
rc/android/media/cts/PresetReverbTest.java
rc/android/media/cts/RingtoneManagerTest.java
rc/android/media/cts/RingtoneTest.java
rc/android/media/cts/SoundPoolTest.java
rc/android/media/cts/ToneGeneratorTest.java
rc/android/media/cts/VirtualizerTest.java
rc/android/media/cts/VisualizerTest.java
278962c83d740b95939de690b01dffeb83b2d834 20-Jan-2012 Brian Muramatsu <btmura@google.com> Missing Commits from ICS MR1

I did a manual diff, and here are some changes that got lost...

Change-Id: I6a8c052629085dde78ad95c2407c349e4e43db71
rc/android/media/cts/AudioRecordTest.java
20185019b611ffeebcb2808f03d1f1c918f6da14 18-Jan-2012 Bryan Mawhinney <bryanmawhinney@google.com> Add a MediaPlayerFlakyNetworkTest

Change-Id: I189610dbbae4f60dfe591d7be6f9e7cb9b9a2068
rc/android/media/cts/MediaPlayerFlakyNetworkTest.java
rc/android/media/cts/MediaPlayerTestBase.java
0dc15a1a49bcf8a7ccc6e5317ad1d87e267bd666 17-Jan-2012 Mist Liao <Mist_Liao@asus.com> am 1358ff83: am 995c5b5e: Checking hardware feature when test rear camera

* commit '1358ff834d08556e907bcebb7b9ceb16b0b89a7b':
Checking hardware feature when test rear camera
995c5b5eb59e41d96ea779bf7295d5f36df2bb5a 06-May-2011 Mist Liao <Mist_Liao@asus.com> Checking hardware feature when test rear camera

To support the device which do not have rear camera

Change-Id: I81bcaa1f4fbdf0b1fb94f5f7c82e2b0e179c629e

Conflicts:

tests/tests/media/src/android/media/cts/MediaRecorderTest.java
rc/android/media/cts/CamcorderProfileTest.java
5df641c2f3c8fca177feeaa8e61d06b5dc7920ed 29-Dec-2011 Brian Muramatsu <btmura@google.com> Move Test XML Generation from buildCts.py

buildCts.py was the central script that generated all the
test package XMLs each time CTS was built. This had a
couple problems:

1. All the XML files for ~40 packages needed to be made
every time CTS was made. Even if those packages were
not touched at all.

2. Couldn't shard the XML generation process across the
available cores on a machine. A pool was added to the
python script, but it was set to a fixed number.

This change moves the test XML generation into a
smaller Java program called "cts-java-scanner" and
the doclet it relies upon to scan the Java files
into "cts-java-scanner-doclet.jar". The output of
the scanner like "cts-native-scanner" for native EXEs
is piped to the existing cts-xml-generator to
produce the test XMLs.

New CTS specific rules replace the standard
BUILD_PACKAGE and BUILD_HOST_JAVA_LIBRARY. They just
add extra rules for the package XML. The BUILD_CTS_PACKAGE
rule also adds a rule for copying the "package.apk"
to something more like "CtsFooTestCases.apk" to the
test case out directory. All the apks, exes, and xmls
are now thrown into a "cts-testcases" directory, before
they are copied to the final CTS distribution.

This change should prevent rebuilding the XMLs
unnecessarily and make rebuilding CTS quicker while
writing tests.

There are still the libcore tests that are always rebuilt,
but they can be adapted to fit into this model someday...

Change-Id: I52a916aa37fd679057e2709bb0ccec694c9fca01
ndroid.mk
7646b3c14b35901e2986e32e3a0990c96a535776 16-Dec-2011 Brian Muramatsu <btmura@google.com> am be1d46ca: am c2b6e165: Increase MediaScannerNotificationTest Timeout

* commit 'be1d46ca01f0565c485511d3ad51755bbf7d0a1f':
Increase MediaScannerNotificationTest Timeout
c2b6e165a5df1be4aacf427c67cfa25b49e91a81 16-Dec-2011 Brian Muramatsu <btmura@google.com> Increase MediaScannerNotificationTest Timeout

Bug 5728172

Raising the timeout to a ridiculous amount just to see if it passes
in the lab at all. Improve the error message to see the file count.

Change-Id: Ifc23604eee6bfbfe84769ee4a17036941d0df183
rc/android/media/cts/MediaScannerNotificationTest.java
3ddf2cf8b9585ed63cd59d53fc2a1573957c5b46 15-Dec-2011 Brian Muramatsu <btmura@google.com> am 5dc6f5e3: am f73562c8: Fix Flakiness in MediaScannerNotificationTest

* commit '5dc6f5e352bc5f841f7effdd8392ec959ba93d10':
Fix Flakiness in MediaScannerNotificationTest
f73562c8bf0af0d23fa7c72e7305345d57f8fd7f 14-Dec-2011 Brian Muramatsu <btmura@google.com> Fix Flakiness in MediaScannerNotificationTest

Bug 5728172

Wait a little longer for the scanner to finish.

Change-Id: I0347bd2864d232fe30526bc3ff8e13cc80d583d4
rc/android/media/cts/MediaScannerNotificationTest.java
67c5210e03f47d835c4f0e2a12a35a1415218141 01-Dec-2011 Keun young Park <keunyoung@google.com> am 0e80e56e: am cd91c24f: Add AAC test to SoundPoolTest - Change the original code to get file/resource names from member functions. (SoundPool is changed to abstract class) - SoundPoolAacTest implements those functions to provide AAC clips - SoundPoolOggTest for Og

* commit '0e80e56e90fe23671d799c61cdf52d48e152abc3':
Add AAC test to SoundPoolTest - Change the original code to get file/resource names from member functions. (SoundPool is changed to abstract class) - SoundPoolAacTest implements those functions to provide AAC clips - SoundPoolOggTest for Ogg - new aac clips in mp4 container added (converted from the original ogg)
cd91c24fdd7bb6a8540c14c78dae7b8b9f8c62f9 30-Nov-2011 Keun young Park <keunyoung@google.com> Add AAC test to SoundPoolTest
- Change the original code to get file/resource names from member functions.
(SoundPool is changed to abstract class)
- SoundPoolAacTest implements those functions to provide AAC clips
- SoundPoolOggTest for Ogg
- new aac clips in mp4 container added (converted from the original ogg)

Change-Id: I940da1117539ee89acb4aa17bb9760c7ed8563f8
rc/android/media/cts/SoundPoolAacTest.java
rc/android/media/cts/SoundPoolOggTest.java
rc/android/media/cts/SoundPoolTest.java
47df0d332399f73455d6aec7e67b64d02691b59c 18-Nov-2011 Brian Muramatsu <btmura@google.com> resolved conflicts for merge of 98bcc322 to ics-mr1

Change-Id: I12a9563ab4e3d2119f7fd6ca8a2921c7baab8d4c
98bcc322cb3a04e0f2c3bb49d08ff3060edc89a6 18-Nov-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb-mr2' into ics-mr0

Conflicts:
apps/CtsVerifier/AndroidManifest.xml
tests/expectations/knownfailures.txt

Change-Id: I1b918333883e0f3d651e9f4d65918974eaa3b72f
ca50a87436d9596c16d0a358f97d95d2f8f3b013 15-Nov-2011 James Dong <jdong@google.com> am 0132dbad: Merge "Add a cts test for MediaRecorder.setLocation() and MediaMetadataRetriever.extractMetadata(METADATA_KEY_LOCATION)" into ics-mr1

* commit '0132dbada15884d0374574de01d4c7c97f724586':
Add a cts test for MediaRecorder.setLocation() and MediaMetadataRetriever.extractMetadata(METADATA_KEY_LOCATION)
b9345101487de2d550766649692a5e40b32e5c3e 10-Nov-2011 James Dong <jdong@google.com> Add a cts test for MediaRecorder.setLocation() and MediaMetadataRetriever.extractMetadata(METADATA_KEY_LOCATION)

Change-Id: I4c947b4ebb44bcdec6c52a640f672ef1f6a195a7
related-to-bug: 5088574
rc/android/media/cts/MediaRecorderTest.java
7f7320d12efae354d5d00f66b6351f499aab1b44 10-Nov-2011 James Dong <jdong@google.com> am 20ae96dd: Merge "Do not use hardcoded frame rate 15 fps in cts test" into ics-mr1

* commit '20ae96ddabf759840889041ab27f17adb1ac4612':
Do not use hardcoded frame rate 15 fps in cts test
1059ed9e9887da21d3d0e9d3c89709b9260b2d74 23-Sep-2011 Wonsik Kim <wonsik@google.com> Fix AudioRecordTest to skip setUp() and tearDown() when MIC is not available.

Because AudioRecord may throw an exception upon construction, bypass this in setUp if a mic is not present

Change-Id: I6b8449b93258b68f0a07fdc30893d3a8eb5746bc
rc/android/media/cts/AudioRecordTest.java
fbc418201042a553b9d860994714401325110574 09-Nov-2011 Eric Laurent <elaurent@google.com> am 78fe700e: Fix AudioManager Ringtone test.

* commit '78fe700ecf2ba9f78f6fb18b5ba740ac25a06d82':
Fix AudioManager Ringtone test.
f3995a6b11268afbf85a195cf7a64f7ac16e228f 09-Nov-2011 Eric Laurent <elaurent@google.com> am 52bab620: Merge "Fix AudioManager volume tests." into ics-mr1

* commit '52bab620b72d4527b1c3b6907408ebb4195529ee':
Fix AudioManager volume tests.
20ae96ddabf759840889041ab27f17adb1ac4612 09-Nov-2011 James Dong <jdong@google.com> Merge "Do not use hardcoded frame rate 15 fps in cts test" into ics-mr1
35b15da525f82e8e10859218420255629e41f856 09-Nov-2011 James Dong <jdong@google.com> Do not use hardcoded frame rate 15 fps in cts test

Change-Id: I1868d2e77f2bc022f6f64e094b4473b34602a82a

related-to-bug: 5587560
rc/android/media/cts/MediaRecorderTest.java
78fe700ecf2ba9f78f6fb18b5ba740ac25a06d82 08-Nov-2011 Eric Laurent <elaurent@google.com> Fix AudioManager Ringtone test.

Make sure that the volume of the stream on which we play the ringtone is not
0 and that we are not in silent mode during ring tone tests.

Issue 5572047.

Change-Id: I0bd80d0ce6f69f6097385d90d41a7ffdfb6f2c4e
rc/android/media/cts/RingtoneTest.java
ab2619e0a23679711b500beb80af30964c8441e1 08-Nov-2011 Eric Laurent <elaurent@google.com> Fix AudioManager volume tests.

Make sure that silent mode is reset before and during volume tests
to avoid dealing with different behaviors of tablets and phones with regard to
silent mode control by certain stream volume changes.

Issue 5572429.

Change-Id: I3eebf112312e95d819e1235343b3e1b5a612bfc8
rc/android/media/cts/AudioManagerTest.java
76ed413e90ad66a92b2f8483810f2ca44aae7abc 07-Nov-2011 Kristian Monsen <kristianm@google.com> Merge "Renaming DelayedCheck to PollingCheck"
0162547f44173f0604d8a80143c128d9892460a1 02-Nov-2011 Kristian Monsen <kristianm@google.com> Renaming DelayedCheck to PollingCheck

This should not change functionality in any way.

Better name, also moving to package android.cts.util when I'm
already there doing renaming.

Want to modify it to check before the first wait as well, but will
wait for this check to be commited first so we can better track
any new test failures.

Change-Id: If6281dd59cb3b183e39c4b9c4f89364e69811751
rc/android/media/cts/AudioRecord_BufferSizeTest.java
rc/android/media/cts/MediaScannerConnectionTest.java
263e29498a2d03d7621476cb6ee6febdbd065572 01-Nov-2011 James Dong <jdong@google.com> Merge "Use published API rather than hard-coded values" into ics-mr1
74c8db916ac8add2d345a102494c523bf3e40e3f 31-Oct-2011 Eric Laurent <elaurent@google.com> Adapt AudioManager volume test to new behavior

The control of silent/vibrate mode by volume keys changed again...
Removed the test of silent/vibrate mode changes induced by volume key presses as
this is defined by the UI spec and not the CDD and is cause for constant mismatch
between CTS and framework behavior.

Change-Id: I62354483357b60848718ca7c73964e2e70f1c2a5
rc/android/media/cts/AudioManagerTest.java
e6d48d0b75c1ff9ec021f0774d9279a9b61c5eda 29-Oct-2011 James Dong <jdong@google.com> Use published API rather than hard-coded values

Change-Id: I06725be355414fc58560fc6f25c4b69b78636ff4
related-to-bug: 5381276
rc/android/media/cts/CamcorderProfileTest.java
84f0df4a98e8e05635189856cd3c363020396bcf 29-Oct-2011 Dave Burke <daveburke@google.com> Fix flaky test #5534184

Change-Id: I92da240528805d36bd77308b3c005c34da84d572
rc/android/media/cts/MediaPlayerTest.java
13d40b45133fb3dd08852b770c9902d83fb1b7f5 25-Oct-2011 James Dong <jdong@google.com> Fix a mismatch problem because of hidden public API in CamcorderProfile.java

Change-Id: I53f6e3a41049af4a605744552a16501bde0375b8
related-to-bug: 5381276
rc/android/media/cts/CamcorderProfileTest.java
65cc34f5b4eb28efa87a597744d7fd586f4ccd9f 25-Oct-2011 James Dong <jdong@google.com> Fix a mismatch problem because of hidden public API in CamcorderProfile.java

Change-Id: I53f6e3a41049af4a605744552a16501bde0375b8
related-to-bug: 5381276
rc/android/media/cts/CamcorderProfileTest.java
1f1d0c74c48490e57e35c5b5bf5f787aba2c638e 20-Oct-2011 Guru Nagarajan <gurunagarajan@google.com> modified: MediaPlayerStreamingTest.java

Change-Id: Ieb1f955c3ac0d03d55d75cff47dcb0e74406b450
rc/android/media/cts/MediaPlayerStreamingTest.java
7d893697000f2634ff5bb9a5d73f7a4d41014053 18-Oct-2011 Eric Laurent <elaurent@google.com> Merge "Align AudioManager test with new volume policy." into ics-mr0
6414866794c720163ae485792fb7ef292b8d3e51 04-Oct-2011 Gloria Wang <gwang@google.com> DO NOT MERGE: Add CTS test for MediaPlayer.setSurface()
For bug 5088394.

Change-Id: I582afae674a7dc8c919613009a048f2715fe090c
rc/android/media/cts/MediaPlayerSurfaceTest.java
e9d1096a1d39bc8cb62f13c30cb8a0cbbb6b4f31 15-Oct-2011 Eric Laurent <elaurent@google.com> Align AudioManager test with new volume policy.

New silent mode policy specifies that ring and notification
stream volume should never reach 0 unless in silent mode.

Change-Id: Ia138cfa0dad905d571c1d2cdc53bee33bb9cba3c
rc/android/media/cts/AudioManagerTest.java
1f87138f65c39bc4a28097fdb7c5d4970183baf8 07-Oct-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb' into honeycomb-mr1
1a15e527b2ba2e47884a3a44b6c073b2856f99ed 07-Oct-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/gingerbread' into honeycomb

Conflicts:
apps/CtsVerifier/AndroidManifest.xml
tests/tests/app/src/android/app/cts/DownloadManagerTest.java

Change-Id: I16c2d14484dea54d89c3ccb105e2dfacace1f9e1
e6bb13d7759706c8af44706e6012e210a04586e1 05-Oct-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb-mr2'

Conflicts:
apps/CtsVerifier/AndroidManifest.xml
tests/core/ctscore.mk
tests/tests/os/src/android/os/cts/BuildVersionTest.java
tools/host/src/com/android/cts/Version.java

Change-Id: Ic3a6a3754f1db91947217af64c43e8b7fb35695e
ac5293df8c4d1d70156b7c5cf6fa08ca0a8289e9 22-Sep-2011 Jeff Davidson <jpd@google.com> resolved conflicts for merge of 77e1aef8 to master

Change-Id: I793bf58354df98ff1dd32c9bec25610c1d849ea2
77e1aef8131b9f15f1b610d50cd2f758116e729d 22-Sep-2011 Jeff Davidson <jpd@google.com> am 1dd2f053: am 4102cb4b: Retry stream playback 5 times before failing test.

* commit '1dd2f0535a6154abd77e1e0de3e84bdfec1846e5':
Retry stream playback 5 times before failing test.
4102cb4b7be71406e18e3960aafbf16aedb2ff30 22-Sep-2011 Jeff Davidson <jpd@google.com> Retry stream playback 5 times before failing test.

Should help with general network flakiness.

Change-Id: I1e4768dbaaeea702973be318f1762b8e6da723cd
rc/android/media/cts/MediaPlayerTestBase.java
4b77a8c877d8a63dfb47b84494dc6696d8fc972f 15-Sep-2011 Eric Laurent <elaurent@google.com> Fix issue 5319044: CTS testVolume fails on CIS

Change volume test according to new silent mode policy
introduced by ICS.

Change-Id: Iab1e0f1d990832295f8d167626aa62f3db8c0177
rc/android/media/cts/AudioManagerTest.java
1eacc524d600f8740b421fdaa3bae2c538a8eb0c 13-Sep-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb' into honeycomb-mr1
d9ccd2272ee92dcb120fb1f104a3e3ef0489ab34 12-Sep-2011 Jason Bayer <bayer@google.com> Bypass a record test if there is no microphone

Change-Id: Ieaaf59a5fc561c0b249bc313a908c72dbbb59adc
rc/android/media/cts/AudioRecord_BufferSizeTest.java
92e323585370f2e8dd51053597a6b19927cc7630 10-Sep-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/gingerbread' into honeycomb

Conflicts:
tests/tests/os/src/android/os/cts/BuildVersionTest.java
tests/tests/security/src/android/security/cts/CertificateTest.java
tools/host/src/com/android/cts/Version.java

Change-Id: Ieb48bc2906fbc9f07e6cf4e161a3dc0195aedcc2
cf0265d0b6efff1b54c44aea56b945df790e73e0 10-Sep-2011 Gloria Wang <gwang@google.com> Reset surface after a seek.
For bug 5189069.

Change-Id: I9a51f85a57f25093d3f682e4935e37681ca511aa
rc/android/media/cts/MediaPlayerTest.java
f59692709771fe1a7ec0e8448ee8e8563f9a89dc 08-Sep-2011 Jeff Davidson <jpd@google.com> am 8a05a952: am b3bb4a4d: am 25eeacbb: MediaPlayerTest local video fixes.

* commit '8a05a952cbeb94eaf5ba6fd9e710b5afd7ca1fee':
MediaPlayerTest local video fixes.
8a05a952cbeb94eaf5ba6fd9e710b5afd7ca1fee 07-Sep-2011 Jeff Davidson <jpd@google.com> am b3bb4a4d: am 25eeacbb: MediaPlayerTest local video fixes.

* commit 'b3bb4a4d392daf141c9574bca6e128b5603f8a30':
MediaPlayerTest local video fixes.
25eeacbbe9ed622f8da22345e4d324324db6f674 07-Sep-2011 Jeff Davidson <jpd@google.com> MediaPlayerTest local video fixes.

Includes regenerated 480x360 content with correct aspect ratio set. Regenerated 176x144 files
seem to be identical to the manually tweaked ones that had already been submitted.

Also fixes a typo that was omitting a test (two tests referred to the same video resource.

Bug: 5231649
Change-Id: I3228be4392ce2f013e3d3c6cebe16f81b4211c5c
rc/android/media/cts/MediaPlayerTest.java
20ab13d8b183ee14703468366a6ad395e25aa1a1 01-Sep-2011 Brian Muramatsu <btmura@google.com> Test for Invalid Ringer Modes

Bug 4499450

Check that setting an invalid ringer mode doesn't do anything.

Change-Id: I24fe167a8f266dbcbb239dd2c6221cd89783515c
rc/android/media/cts/AudioManagerTest.java
c45972aff0798c7fe430919b85af3c253786a4cb 31-Aug-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb-mr2'

Conflicts:
apps/CtsVerifier/AndroidManifest.xml
apps/CtsVerifier/res/values/strings.xml
apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
tests/expectations/knownfailures-3.0_r1.txt
tests/expectations/knownfailures.txt
tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
tests/tests/os/src/android/os/cts/BuildVersionTest.java
tools/host/src/com/android/cts/Version.java

Change-Id: If9da4508f8eee25351538e3118e6ae990be49c60
e7ab987437e096df0b15c490693040825790ffa0 25-Aug-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb' into honeycomb-mr1

Conflicts:
apps/CtsVerifier/AndroidManifest.xml
apps/CtsVerifier/res/values/strings.xml
tests/tests/media/src/android/media/cts/MediaPlayerTest.java
tests/tests/media/src/android/media/cts/MediaRecorderTest.java
tools/host/src/com/android/cts/Version.java

Change-Id: Ic0ec7b9654683d7686c9d7f714caf5cbacef7aad
75aa28b03c321decb0cc64e9ba82ed6040d46861 25-Aug-2011 Jeff Davidson <jpd@google.com> Add HLS streaming tests to ICS CTS.

Change-Id: Ib993521231a60d277f4cf8dbd2eb4261370682c2
rc/android/media/cts/MediaPlayerStreamingTest.java
rc/android/media/cts/MediaPlayerTestBase.java
c6ee61599563866822f3f46d9d56256121588999 24-Aug-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/gingerbread' into manualmerge

Conflicts:
apps/CtsVerifier/AndroidManifest.xml
tests/tests/media/src/android/media/cts/AudioManagerTest.java
tools/host/src/com/android/cts/Version.java

Change-Id: I3ab7d4bc883e3ed6dd853401d9537e3e0ff58f1c
9a916526e9fd7c94b78849eccd9203f59eb4b8e1 24-Aug-2011 Jeff Davidson <jpd@google.com> am 21fbc127: am 1bc4bb82: am 1fb40650: Merge "Fix expected RTSP stream sizes." into gingerbread

* commit '21fbc127f2a52ab525787065cffabac73d67979f':
Fix expected RTSP stream sizes.
21fbc127f2a52ab525787065cffabac73d67979f 24-Aug-2011 Jeff Davidson <jpd@google.com> am 1bc4bb82: am 1fb40650: Merge "Fix expected RTSP stream sizes." into gingerbread

* commit '1bc4bb8229c9dbd2279964cf510c92a35ed6fe15':
Fix expected RTSP stream sizes.
f33f5361ffdf5d4644e0a2f15395af0872df0901 24-Aug-2011 Jeff Davidson <jpd@google.com> Fix expected RTSP stream sizes.

Change-Id: Ifa5097b32875ec2d0ae69e2cd1f0e7082783f545
rc/android/media/cts/MediaPlayerStreamingTest.java
f934fc02c4873047e29166df4193debcf905eef1 24-Aug-2011 Jeff Davidson <jpd@google.com> am 42d90de1: am 0465d4fb: am 455358bb: Merge "Enable RTSP tests." into gingerbread

* commit '42d90de13142322ff4087188e5ed4514c313dee0':
Enable RTSP tests.
42d90de13142322ff4087188e5ed4514c313dee0 24-Aug-2011 Jeff Davidson <jpd@google.com> am 0465d4fb: am 455358bb: Merge "Enable RTSP tests." into gingerbread

* commit '0465d4fbd20a8d216cc903ea997b04e69e3bb3e3':
Enable RTSP tests.
a32dba6ff06b95c0eb0bd9f1b36a9b378c2e16e3 24-Aug-2011 Jeff Davidson <jpd@google.com> Enable RTSP tests.

Change-Id: Ibe9c49225d9418300fa098a2750571b1a5300e94
rc/android/media/cts/MediaPlayerStreamingTest.java
913a7ed63bd35e3bc5384ec50bc854a8af92fd10 23-Aug-2011 Brian Muramatsu <btmura@android.com> am 4b02fdf8: am deee76ce: am de6ee5ce: Merge "Test for AudioRecord#getMinBufferSize" into gingerbread

* commit '4b02fdf898b91f171634fe03de25fba58a6caafb':
Test for AudioRecord#getMinBufferSize
4b02fdf898b91f171634fe03de25fba58a6caafb 23-Aug-2011 Brian Muramatsu <btmura@android.com> am deee76ce: am de6ee5ce: Merge "Test for AudioRecord#getMinBufferSize" into gingerbread

* commit 'deee76cef31a66a388805fce5c994b74e0158206':
Test for AudioRecord#getMinBufferSize
de6ee5ce2b5983ed64dbf6faa6de648828e5172e 23-Aug-2011 Brian Muramatsu <btmura@android.com> Merge "Test for AudioRecord#getMinBufferSize" into gingerbread
7d4d5945a42618edda2a7be0356ad975647f7660 22-Aug-2011 Brian Muramatsu <btmura@android.com> Test for AudioRecord#getMinBufferSize

Bug 5067912

Call AudioRecord#getMinBufferSize with 16-bit PCM encoding
and sample rates of 8000, 11025, 16000, and 44100. Start
recording and call read once.

Change-Id: I08b4fe04d6513fdce6f165b92d4caeebf2c54c2b
rc/android/media/cts/AudioRecord_BufferSizeTest.java
8c5f2151edf04f8bfa3c2b6e28659a6e69a22387 23-Aug-2011 Jeff Davidson <jpd@google.com> am 07c67ebd: am 2b755c50: am d7c6d9dc: Merge "Add basic HTTP and RTSP streaming tests to CTS." into gingerbread

* commit '07c67ebdd10440e37fa2b971eea3839db3415b51':
Add basic HTTP and RTSP streaming tests to CTS.
07c67ebdd10440e37fa2b971eea3839db3415b51 23-Aug-2011 Jeff Davidson <jpd@google.com> am 2b755c50: am d7c6d9dc: Merge "Add basic HTTP and RTSP streaming tests to CTS." into gingerbread

* commit '2b755c50129e08f1f8dbe996d9cd49189eb28bc2':
Add basic HTTP and RTSP streaming tests to CTS.
42ddd86a297a6a7035d09b4540b7f5acf4fdb293 18-Aug-2011 Jeff Davidson <jpd@google.com> Add basic HTTP and RTSP streaming tests to CTS.

Reviewers from Media team: Most of the work for this was done in previous CLs -
you'll probably want to look at the functions that actually do the work of
playing the video to make sure they're okay.

Change-Id: Ia8d9cbc23ddacef2ba2cf862377033ecca7e1260
rc/android/media/cts/MediaPlayerStreamingTest.java
rc/android/media/cts/MediaPlayerTestBase.java
6fbbe16e2cf82518b3e251d74bd5763f6007da9b 19-Aug-2011 Jeff Davidson <jpd@google.com> Re-add test for replacing surface during video playback.

Bug: 5189863
Change-Id: Ie2ddd90d5a6469bf7320b9585a38a9c48c1846d2
rc/android/media/cts/MediaPlayerTest.java
846df5849873107868e6c4d06182c0d3e3cdea60 20-May-2011 sam_chiu <sam_chiu@htc.com> add a possible volume behavior.
Some device will be silent mode after the first volume up from vibrate mode.(removed tab)

Change-Id: Ibf8c323a160ca1e3f2611c0b746976ac9b1942e7
rc/android/media/cts/AudioManagerTest.java
56ce0bb8441d3bbdbf134d962f38ecb1e10b338c 18-Aug-2011 Jeff Davidson <jpd@google.com> am b7759530: am 9652870a: am 0c804176: Merge "Add local video tests." into gingerbread

* commit 'b7759530e3bbec85e5a9cf1e7e0ff75656290b55':
Add local video tests.
b7759530e3bbec85e5a9cf1e7e0ff75656290b55 18-Aug-2011 Jeff Davidson <jpd@google.com> am 9652870a: am 0c804176: Merge "Add local video tests." into gingerbread

* commit '9652870abb8917070724643831d40762cb8557ff':
Add local video tests.
bae7843b6073feb1b18763d2b9ed7e08288decc3 17-Aug-2011 Jeff Davidson <jpd@google.com> Add local video tests.

Also, clean up playVideoTest - removes seemingly unnecessary signal handling
logic, and fixes check to onVideoSizeChangedCalled, as the size was being
changed before our call to wait(), leading us to wait until a 60 second
timeout was reached before proceeding with the test.

Change-Id: Ie4c42e8d66c13ac434b734f0a079620a1381c1b0
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
9e4c43b0ed1d7cd2522c222008ad84fcf58152c9 17-Aug-2011 Jeff Davidson <jpd@google.com> resolved conflicts for merge of 2cf803de to master

Change-Id: I3cda5ecf88894d314204a585fb03a1d441fc97f4
cf19e6043551f36681795cd73e0d0317bbe90137 17-Aug-2011 Brian Muramatsu <btmura@android.com> Merge "Avoid 2 fails if no camera on device" into gingerbread
2cf803dec1535b778bb98ffc91cfa46e08b6df41 17-Aug-2011 Jeff Davidson <jpd@google.com> am 40d755c2: am f22b3ecc: Merge "Additional refactoring of MediaPlayer tests." into gingerbread

* commit '40d755c2c49c328a64a1bdada8a609a825dabd94':
Additional refactoring of MediaPlayer tests.
45dd2f15092680526902b37d7118f039783fe893 15-Aug-2011 Jeff Davidson <jpd@google.com> Additional refactoring of MediaPlayer tests.

Rename MediaPlayerTestHelpers to MediaPlayerTestBase, a base class that can
be extended to easily create new MediaPlayer tests. MediaPlayerTest now
consists of tests of local files, and MediaPlayerStreamingTest consists of
tests of streams (such as the local HTTP streams that were previously in
MediaPlayerTest).

Change-Id: I9aac07e8fdbc79bcd763e0a5e0c16254c42b39b0
rc/android/media/cts/MediaPlayerStreamingTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestBase.java
rc/android/media/cts/MediaPlayerTestHelpers.java
b564b2295353fa68f6e6a18a201e60cbf5325f1e 13-Aug-2011 Jeff Davidson <jpd@google.com> am 89116fe6: am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread

* commit '89116fe61d021dd7479b099860ebf70e18521944':
MediaPlayer test cleanup + new streaming test placeholder.
89116fe61d021dd7479b099860ebf70e18521944 13-Aug-2011 Jeff Davidson <jpd@google.com> am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread

* commit '8b570fd47c096a3d54ccc0f9d2fa71c0805339f2':
MediaPlayer test cleanup + new streaming test placeholder.
4c29d970b828238a25b4b708692bff0fe47d5449 12-Aug-2011 Jeff Davidson <jpd@google.com> MediaPlayer test cleanup + new streaming test placeholder.

Removes unneeded annotations and clears compiler warnings. Since there are
already many MediaPlayer API tests in MediaPlayerTest, additional API tests
that we add (like the null stream location added in this CL) should be here.
New tests related to streaming should go in MediaPlayerStreamingTest.

Change-Id: I239930c058fabf65fb7c4e34af0c142255f59f32
rc/android/media/cts/MediaPlayerStreamingTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaPlayerTestHelpers.java
7e06ff8c197221bb81847759083436e62869f827 08-Aug-2011 Fabou <fabien.duvoux@parrot.com> Avoid 2 fails if no camera on device

If there is no camera on the device testRecorderVideo and testRecorderCamera can't be achieved.
Test before recording if there is a camera on the device

Change-Id: I311472c889aa5110aa0a2e9bbaf101ee0e9df9e3
Signed-off-by: Fabou <fabien.duvoux@parrot.com>
rc/android/media/cts/MediaRecorderTest.java
32044842516b181a7dde85e030ce34bdf9d76285 12-Aug-2011 Eric Laurent <elaurent@google.com> Fix issue 5144429: CTS test fails for AudioEffects

AudioEffect constructor tests should specify a valid AudioRecord
audio session for pre processing effects.

Change-Id: I0836de1855d7e5675ffadaa4338ed375889d4ddb
rc/android/media/cts/AudioEffectTest.java
ed3f33cb01f3f7156b45f9ebf2e65ec5f4f0c55b 09-Aug-2011 Gloria Wang <gwang@google.com> Test runtime switch between null surface and non-null surface.

Change-Id: I1378cd61885d9437364e773777bc1600e689d115
rc/android/media/cts/MediaPlayerTest.java
61f9755ffca5092115000088a6c91883c5fed905 05-Aug-2011 Jason Bayer <bayer@google.com> Check new mediarecorder tests that require mic

Change-Id: I57d23cbec45f736b2d103682e3f1525b92e280ae
rc/android/media/cts/MediaRecorderTest.java
1686dfe54c110ea64f5a2a4f3736d90224c6c1a2 29-Jul-2011 Gloria Wang <gwang@google.com> Add a CTS test for replacing a surface at run time during video playback.
Fix for bug 5088614.

Change-Id: Ic22f919432579328b8bd282700b1020950e49a41
rc/android/media/cts/MediaPlayerTest.java
9ceaf260efdcb2e006732b29066a47933beeb9e4 27-Jul-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb' into manualmerge
4e9df1a479d6fe383fed0adf9ab3c4f9b7729934 27-Jul-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/gingerbread' into manualmerge
c61ba23df1820f349fead5703953f23d120294b5 21-Jul-2011 Le-Chun Wu <lcwu@google.com> Skip testRecordAndPlay when the system does not have a microphone.

Change-Id: I436d4188d455cad214025d818955f33eb8aef813
rc/android/media/cts/MediaPlayerTest.java
c71837f4f702040f9c0ec3f613221d3f817ca424 20-Jul-2011 Brian Muramatsu <btmura@android.com> am ec9f5cb2: am 2a17399b: am 22bdacf2: Merge "Added and updated test cases in CTS." into gingerbread

* commit 'ec9f5cb25a4320b595c9fbf0cea7d5c1311d9f42':
Added and updated test cases in CTS.
ec9f5cb25a4320b595c9fbf0cea7d5c1311d9f42 20-Jul-2011 Brian Muramatsu <btmura@android.com> am 2a17399b: am 22bdacf2: Merge "Added and updated test cases in CTS." into gingerbread

* commit '2a17399b0e74effcb712167430876281dad57828':
Added and updated test cases in CTS.
399ffdacc357d863058baa8de926e57dbedc4fc8 08-Jul-2011 Maheshwar Singh <maheshwar.x.singh@sonyericsson.com> Added and updated test cases in CTS.

Added and updated test cases in CTS for improving the code coverage
for android.graphics package.

Change-Id: Id701213b77055ae737c4a92cf81c4eb8ac75f6fc
rc/android/media/cts/MediaRecorderTest.java
e4af16caefc41e25ff454974aecaacc2f88a18c5 15-Jul-2011 Brian Muramatsu <btmura@android.com> am 7fe27176: am 5a908db3: am 27b44809: Merge "add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage" into gingerbread

* commit '7fe27176863ee820e61b625cbb74dc30946b92c7':
add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage
7fe27176863ee820e61b625cbb74dc30946b92c7 15-Jul-2011 Brian Muramatsu <btmura@android.com> am 5a908db3: am 27b44809: Merge "add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage" into gingerbread

* commit '5a908db3c8e9202ee841082fd3a8fff04a9afa58':
add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage
d1a9ec6b670009c6597b7d45015b2181daac3d72 11-Jul-2011 Wade Guthrie <wdg@google.com> Fix for testPlayVideo timeout (thanks to Jason Bayer for CountDownLatch).

Change-Id: I5ac61daf583f7a087c4b28b04c6167a1a7b98ea4
rc/android/media/cts/MediaPlayerTest.java
23c84d9d2a87928518c5a4a5bbe5774f581f64e6 13-Jul-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/honeycomb' into manualmerge

Change-Id: If2682edd4c0264eefe4c3ac669333ac6785da606
68bce37aef5da453011cd6180cd799cc3bf94ea7 13-Jul-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/gingerbread' into manualmerge

Change-Id: I9ec4b97612365d5b10908da2dd45c4b03c9af3c2
d541b30396364d4455596ad11dce8a11111028de 05-Jul-2011 Zhihong GUO <zhihong.guo@orange-ftgroup.com> add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage

Change-Id: I4cd46718e6ed413a29630a78b3734f90e99f7ed7
rc/android/media/cts/MediaScannerNotificationTest.java
5a24d2452ca18fe3d1295280690a7851f1a41291 12-Jul-2011 Brian Muramatsu <btmura@google.com> resolved conflicts for merge of 3dd3b6a8 to master

Change-Id: I27437b34ee8792334b18f3d888092b28b16c0b33
765194102fd8f94034704a1d9eb582129fd6ef05 31-Mar-2011 Yuncheol Heo <ycheo@google.com> Fixes AudioRecorderTest and MediaRecorderTest when there are no mics or cameras present

Change-Id: I00de93156c551acd007037979b9ee48e89698bef
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/MediaRecorderTest.java
75ba8288c14150e448091c938ac9cbb15161fae8 15-Jun-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/gingerbread' into manualmerge

Conflicts:
tests/tests/text/src/android/text/method/cts/TouchTest.java
tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
tools/host/src/com/android/cts/Version.java

Change-Id: I6196b9bd85b4e93978dd0ae9b457812b08bd7f0e
5c706d1df9cf3ac759a21c97674af36f815e48ad 09-Jun-2011 Brian Muramatsu <btmura@android.com> am 443a3623: am b9e6bc87: am 22fd9b67: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread

* commit '443a36234ffbcf01db0bf3d476e2f0929c9f4d95':
Revert "Check "Unknown Sources" is Enabled by Default"
Increment Version to 2.2_r6
Add more CTS tests.
Check "Unknown Sources" is Enabled by Default
Don't fail if vold.fstab is empty
Don't fail on netlink socket closing.
443a36234ffbcf01db0bf3d476e2f0929c9f4d95 08-Jun-2011 Brian Muramatsu <btmura@android.com> am b9e6bc87: am 22fd9b67: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread

* commit 'b9e6bc874d4a16924ddc6689c3ebb17436dcafd0':
Revert "Check "Unknown Sources" is Enabled by Default"
Increment Version to 2.2_r6
Add more CTS tests.
Check "Unknown Sources" is Enabled by Default
Don't fail if vold.fstab is empty
Don't fail on netlink socket closing.
02551c5c4bb55be5eea6b33aed5bee5a72d21f4b 06-Jun-2011 Brian Muramatsu <btmura@android.com> Merge remote branch 'korg/froyo' into manualmerge

Conflicts:
tools/host/src/com/android/cts/Version.java

Change-Id: I742c222786c9b883c152cbb0cac1008451188106
09a875085da3bf2ebb70970b22c5886eb254ada3 03-Jun-2011 Marco Nelissen <marcone@google.com> Add more CTS tests.

These tests cover streaming mp3 over http, streaming the same file
again, streaming with a redirect, streaming with unknown content
length, streaming ogg vorbis, streaming ogg vorbis with redirect,
and streaming ogg vorbis with unknown content length.

Change-Id: I40b0dd5f7d1b44c2e27ab46bff5e0850d65e4776
rc/android/media/cts/MediaPlayerTest.java
971ed387ec51437894d051fd9130af33e943fdf2 12-May-2011 Brian Muramatsu <btmura@android.com> am a911ad43: am 3594aecd: am 5dbaee64: Merge "Checking hardware feature when test rear camera" into gingerbread

* commit 'a911ad43c54c26f984cd1235ae8b0ed3a48dddfa':
Checking hardware feature when test rear camera
a911ad43c54c26f984cd1235ae8b0ed3a48dddfa 11-May-2011 Brian Muramatsu <btmura@android.com> am 3594aecd: am 5dbaee64: Merge "Checking hardware feature when test rear camera" into gingerbread

* commit '3594aecd0dea73da2e18e97095d4ae29a3a5bc8a':
Checking hardware feature when test rear camera
9e9e658e92e044157eef51e2fd15768332f7b790 06-May-2011 Mist Liao <Mist_Liao@asus.com> Checking hardware feature when test rear camera

To support the device which do not have rear camera

Change-Id: I81bcaa1f4fbdf0b1fb94f5f7c82e2b0e179c629e
rc/android/media/cts/MediaRecorderTest.java
8c65c60f717ad985f975b55f0745641651a9925e 06-May-2011 Mist Liao <Mist_Liao@asus.com> Checking hardware feature when test rear camera

To support the device which do not have rear camera

Change-Id: I81bcaa1f4fbdf0b1fb94f5f7c82e2b0e179c629e
rc/android/media/cts/CamcorderProfileTest.java
rc/android/media/cts/MediaRecorderTest.java
a3712c065dd0ae4893aa9e9b715903f9ce353da3 31-Mar-2011 Brian Muramatsu <btmura@google.com> Merge remote branch 'goog/gingerbread' into manualmerge

Conflicts:
tests/tests/app/src/android/app/cts/InstrumentationTest.java
tests/tests/content/src/android/content/cts/ContextTest.java
tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
tests/tests/os/src/android/os/cts/BuildVersionTest.java
tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
tests/tests/util/src/android/util/cts/EventLogTest.java
tests/tests/view/src/android/view/cts/WindowTest.java
tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
tools/host/src/com/android/cts/TestDevice.java

Change-Id: Ic4ee072b6c82f97ba256b25a71db153195c958b9
36bfad19085eebd09f5b90d56f8b793d2a8f2a9c 30-Mar-2011 Brian Muramatsu <btmura@google.com> resolved conflicts for merge of 23843efb to master

Change-Id: I9b5b1141e1ad47eace03cdeafa4b92ebbfa58a2b
23843efbe9aea213e840887cc40a0966d505ec3d 29-Mar-2011 Brian Muramatsu <btmura@android.com> am f0180049: am 22934f4c: am 8fcbb1ce: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread

* commit 'f018004925dc80f2a6474548df4598df89ff42f6':
Ignore Tests with Side Effects
Added view.invalidate() in testComputeScroll.
Increase time interval in points provided to VelocityTracker
Froyo-specific startcts Fixes
Revert "Allow 2.2.3 for Build.VERSION"
Increment CTS Version to 2.2_r5
Allow 2.2.3 for Build.VERSION
CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize
Adding DelayedCheck() in testHasWindowFocus.
Adding DelayedCheck() in testInputConnection.
Add test to verify an uninstall of app wipes its data.
Modified so that if network does not support multipart / data SMS, it skips this test.
Add wait in testOnWindowFocusChanged.
d9f0c742badcb46136f079b929073dabba958e23 29-Mar-2011 Brian Muramatsu <btmura@android.com> am 6ddc35e4: am 4a570397: am 9b14e829: am 6fb34673: Merge "Change max/min level range to allow the equalizer to be replaced" into gingerbread

* commit '6ddc35e4ee7846891413834aa0d7b5881a97a323':
Change max/min level range to allow the equalizer to be replaced
6ddc35e4ee7846891413834aa0d7b5881a97a323 29-Mar-2011 Brian Muramatsu <btmura@android.com> am 4a570397: am 9b14e829: am 6fb34673: Merge "Change max/min level range to allow the equalizer to be replaced" into gingerbread

* commit '4a570397ba675a8818e93f2e889afd616608780d':
Change max/min level range to allow the equalizer to be replaced
5d25d43cb2e984c7af6757075df4669b2e46da55 24-Mar-2011 Brian Muramatsu <btmura@android.com> Merge remote branch 'korg/froyo' into froyomerge

Conflicts:
tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
tests/tests/view/src/android/view/cts/ViewTest.java
tools/host/src/com/android/cts/Version.java
tools/utils/CollectAllTests.java

Change-Id: I32c04ce6a2eba4c1f30fe80afb9bf2adcf269e73
5df7d5552c2dacd2efdf080dc0a1ecf3dd2cbf2a 23-Mar-2011 Tomoharu Kasahara <tomoharu.kasahara@sonyericsson.com> Change max/min level range to allow the equalizer to be replaced

Audioeffect framework has a mechanism to replace the effect with
the enhanced version. Some equalizer can have a solid equalizing
implementation with appropriate band gains. Max/min level range
should not be limited with a fixed value. According to the OpenSL
ES 1.0.1 specification(http://www.khronos.org/opensles/), the
range returned by GetBandLevelRange must at least include 0mB.
So this fix changes to check if the maximum level range is not
negative and minimum level range is not positive.

Change-Id: I0145545bddc35db119c82817882ea26a35268645
rc/android/media/cts/EqualizerTest.java
b22136a36b3d88a97a98d402f48a58095b888479 21-Mar-2011 Eric Laurent <elaurent@google.com> Fix issue 3509396: AudioEffect.getParameter JAVA.

Modified AudioEffect tests to reflect new usage of getParameter()
method return status.

Change-Id: If885437bc7b2aafba0da52faa88e80dd24b273d4
rc/android/media/cts/AudioEffectTest.java
4d12521c5885d6a76bde16f464756bfbdbe22b40 16-Mar-2011 karimuddin sayed <sayed.karimuddin@ti.com> CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize

This patch modifies the audio track buffer size for some test cases.
If the buffer size is not multiple of framesize in track.write, the audio track write function
hangs as frame count * framesize doesn't match the buffer size sent.
eg: if minbuffersize = 7524, buffersizesent = minbuffersize/2 = 3762

framecount = 3762/4(frame_size) = 940.5 (as it is fractional number considers as 940)

framecount*frame_size = 940*4=3760 and the write function hangs to get the remaining 2 bytes.

As buffersize is always multiple of frame_size, it is good to sent the entire buffer to track.write
function to avoid this kind of issues.

Change-Id: I6fda86ad12dc3b1e1735caa3bb527de87c7b3586
Signed-off-by: karimuddin sayed <sayed.karimuddin@ti.com>
rc/android/media/cts/AudioTrackTest.java
cbe4ab21f71527a19212d37e1c53748c93653f8c 10-Mar-2011 James Dong <jdong@google.com> am 9dcd2c26: Allow 1080p to be either 1920x1088 or 1920x1080

* commit '9dcd2c265c37271419f4422d218ab7dea8fc505e':
Allow 1080p to be either 1920x1088 or 1920x1080
9dcd2c265c37271419f4422d218ab7dea8fc505e 10-Mar-2011 James Dong <jdong@google.com> Allow 1080p to be either 1920x1088 or 1920x1080

bug - 4075831

Change-Id: I1fc11fd3963bf0da46510eacfd4a5270cc13b7ba
rc/android/media/cts/CamcorderProfileTest.java
2926bf82cbdd0ff89870d1001c0e4a7831a99f20 01-Mar-2011 Brian Muramatsu <btmura@google.com> resolved conflicts for merge of 6959c90f to honeycomb-plus-aosp

Change-Id: I57e50f27d820383a53696782730ef502b3d28989
db5bb6a8fa101d3eebb2db6b41b246436a2cb6aa 01-Mar-2011 Brian Muramatsu <btmura@android.com> Merge remote branch 'korg/froyo' into froyomerge

Conflicts:
tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
tests/tests/view/src/android/view/cts/WindowTest.java

Change-Id: Ibf7651011e4e594d0173c90f6341f75a9e71d45b
5a8b2768f2556b390e44bde852ef8e4e9091ddb1 18-Feb-2011 m-miyahara <m-miyahara@ct.jp.nec.com> Using different filenames for testRecorderVideo and testRecorderCamera.

There are some cases where these failures will be caused due to same filename being used in these test cases.

To avoid this, I changed so that different filenames will be used for testRecorderVideo and testRecorderCamera.

Change-Id: I6bf84aff1034c246cf7bfecf0d8692fc00919b95
rc/android/media/cts/MediaRecorderTest.java
8db9139101ff89d4a42787adbf5dd7ea15c344bc 18-Feb-2011 Brian Muramatsu <btmura@google.com> am 5f0b6efd: Merge "Fix AudioManagerTest#testVolume Yet Again" into honeycomb

* commit '5f0b6efd28d97d3e12ebb262b25ca8bda68be1d8':
Fix AudioManagerTest#testVolume Yet Again
1499f93d2a9c271053800b66059b3047a5b984fb 18-Feb-2011 Brian Muramatsu <btmura@google.com> DO NOT MERGE Merge remote branch 'goog/honeycomb-plus-aosp' into manualmerge

This adds all the commits contributed to the open-source Froyo and
Gingerbread branches that didn't make it into Honeycomb due to the
automerger setup.

Change-Id: Ic160b0f7232bc654ae53536b2c100005694038e8
7f64e85ec7c67eabecac377357fad2c63424d1df 18-Feb-2011 Brian Muramatsu <btmura@google.com> Include Missing Commits from gingerbread-plus-aosp

These somewhat got ignored as part of (HOW!?):

Merge remote branch 'korg/froyo' into manualmerge
C-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83

A lot has changed, so its not an exact cherry-pick.

Change-Id: I5347f2c15eadf59511de11cf08e16be5f66e5b0e
rc/android/media/cts/AudioTrackTest.java
2bfa5eb29cf5c718e0731911030374968736553d 18-Feb-2011 Brian Muramatsu <btmura@google.com> Fix AudioManagerTest#testVolume Yet Again

The test was passing a 100 into the flags (why?) and this matched the
FLAG_FORCE_STREAM (32) flag which tried to then adjust the volume of
the USE_DEFAULT_STREAM (Integer.MIN_VALUE) and then crashed.

"Fix issues 3425035 and 3423785." was the cause, but I don't think
the test was testing anything useful by passing in a 100...

Change-Id: I60a088167083e12099830bd75c4f9a09d1039f35
rc/android/media/cts/AudioManagerTest.java
32dec5a77fe53c865be7b3ae4f76793605365046 10-Feb-2011 Brian Muramatsu <btmura@android.com> am 62dc53fa: am 7bffaa65: am dc677aa6: Merge "Delete Broken AudioManagerTest#testMuteSolo" into gingerbread

* commit '62dc53fae591c4d56d4776c5f5fde382522c18ee':
Delete Broken AudioManagerTest#testMuteSolo
bf0a74c6616cec161cd2820c4de2e3f2b43d8c03 09-Feb-2011 Brian Muramatsu <btmura@android.com> Delete Broken AudioManagerTest#testMuteSolo

Bug 3188260

There is not a way using the public API to determine what streams can
be muted, so remove the broken test.

Change-Id: I5ed6c5eb65ca988fbc467d3586a434a2e3924846
rc/android/media/cts/AudioManagerTest.java
29737cb49e084785cb0e10057c7e0657bcb8ad50 08-Feb-2011 Brian Muramatsu <btmura@google.com> am ddc2612f: Merge "Fix AudioManagerTest#testVolume" into honeycomb

* commit 'ddc2612f561c3cdfcb2fc94a2de151259680d29b':
Fix AudioManagerTest#testVolume
18d0b35a47ad93a9e089f55650293b4fa8586f03 05-Feb-2011 Brian Muramatsu <btmura@google.com> Fix AudioManagerTest#testVolume

"Change I7e5a0724: Fix issue 3371080" changed 2 aspects of how the
AudioManager worked:

1. Decreasing the volume from 1 with FLAG_ALLOW_RINGER_MODES no longer
changes the mode. It must be decreased from 0.

2. You cannot adjust the volume using ADJUST_LOWER twice in a row...
In reality, an ADJUST_SAME event follows, so the mPrevVolDirection
gets set to something different and thats why everything still
works via the buttons.

Change-Id: I95fdbad0ea1c776acebcb222a257a015b8c24162
rc/android/media/cts/AudioManagerTest.java
ae5c4845ba87ccf056cc188c4c30032cc8e79543 04-Feb-2011 Brian Muramatsu <btmura@android.com> am 5f43aebc: am d8ccc313: am acbf1acf: Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread

* commit '5f43aebca037a165801b152ca66c11527837c93a':
Fix Broken MediaRecorderTest#testSetCamera
acf591572770c730de56e8005fa341c5252015e1 01-Feb-2011 Brian Muramatsu <btmura@android.com> Fix Broken MediaRecorderTest#testSetCamera

Bug 3188260

The test needs to unlock the camera before passing it to the
MediaRecorder. This is apparently normal as seen in
VideoCamera.java in the Camera project.

Change-Id: Iecc55a2e39929c3637ff5eed805a75fcf5568ca1
rc/android/media/cts/MediaRecorderTest.java
165b9258448237045bbae00a8d0a993acaa4899e 29-Jan-2011 Brian Muramatsu <btmura@android.com> am 83fb57c5: am b2c05ebd: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread

* commit '83fb57c5126fe0613fd304f7c94e4970bb984b7e':
CTS test is not considering the case when the devcie get into SILENT mode by volume down key.
67906c5468c15832bb7758c3be9048764f2105d6 26-Jan-2011 Brian Muramatsu <btmura@android.com> am cc028bc0: am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo

* commit 'cc028bc0f481263cfc4559d389e935289a8e8b82':
CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode.
e44922b4fc970aac4e2f8e02df4de07c439c35c5 26-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge 1cc918c9 from gingerbread

Change-Id: Ib0052ac9c6c8474206e9c470fb88f359c42eccd2
ce15ad69b260d7dbd8a264b1cb7311cbeafb7430 26-Jan-2011 Brian Muramatsu <btmura@android.com> am c466bf6a: am 83fb57c5: am b2c05ebd: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread

* commit 'c466bf6ab7c60b419c67887b5269113f716602d8':
CTS test is not considering the case when the devcie get into SILENT mode by volume down key.
c98a671f2336e0018ea48035cc0747c0cb10a035 24-Jan-2011 m-miyahara <m-miyahara@ct.jp.nec.com> CTS test is not considering the case when the devcie get into SILENT mode by volume down key.

When volume gets down to SILENT mode, added the condition to go to VIBRATE mode or SILENT mode instead of SILENT mode only.

Change-Id: I4ad6302d3d3eba3109e3d0de3060685c9a7013c8
rc/android/media/cts/AudioManagerTest.java
800c9ca719f69e04e59403ba3dc5138cdb880d44 24-Jan-2011 m-miyahara <m-miyahara@ct.jp.nec.com> CTS test is not considering the case when the devcie get into SILENT mode by volume down key.

When volume gets down to SILENT mode, added the condition to go to VIBRATE mode or SILENT mode instead of SILENT mode only.

Change-Id: I50e4d45035975c418d244e15d892d37435119d72
rc/android/media/cts/AudioManagerTest.java
474ca2e23952463f7ce8eb6fea56ae51151d3a47 20-Jan-2011 Brian Muramatsu <btmura@android.com> Merge remote branch 'korg/froyo' into manualmerge

Conflicts:
tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java
tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java

Change-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83
dc73e313a242d86a682dcedff643a18c0c07af12 14-Jan-2011 Brian Muramatsu <btmura@android.com> Merge remote branch 'korg/froyo' into gingerbread

Change-Id: Ieea971689f21c7a010c49d85818ef4ac089f3202
92030213afe7f071550f5e4ff5f1fbe23f983e05 13-Jan-2011 Brian Muramatsu <btmura@android.com> am d9f3df62: am cc028bc0: am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo

* commit 'd9f3df627e5d49773f4f534e9d422819a665e367':
CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode.
82108824cf1440093001d4f7ef28138048754d15 13-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am b0ad6447: am 1cc918c9: reconcile with open-source gingerbread CTS

* commit 'b0ad644738619bab0a63268054d3a625baeb1047':
Add vogar expectation file support for CTS.
Nuke TrafficStatsTest#testTrafficStatsWithHost...
Nuke GridViewTest#testScroll
Nuke WebChromeClientTest#testOnReceivedIcon
Update BuildVersionTest for 2.3 and 2.3.1
Update startcts Script
Allowing more than one index for cursor position
Corrected android.media.cts.AudioEffectTest#test1_0ConstructorFromType
cc028bc0f481263cfc4559d389e935289a8e8b82 11-Jan-2011 Brian Muramatsu <btmura@android.com> am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo

* commit 'e0ee543b59789a1ff370d30ec06fce6a8446de11':
CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode.
2519185412d2bed81fe6c0736d4a06ce8bb32a8e 04-Jan-2011 Eunice <yonhee.yu@lge.com> CTS test is not considering the case when the devcie get into SILENT mode
by volume down key.
It needs to be raised twice to get back to NORMAL mode from the SILENT mode.

Change-Id: I094840860ae92256263331dd0e3d40fa26a3a6e1
rc/android/media/cts/AudioManagerTest.java
d26929ab5fbffc055c1e4137e436fc1adcd2e774 06-Jan-2011 Eunice <yonhee.yu@lge.com> 100ms does not gurantee trigerring the audio. the test always passed with 200ms
rc/android/media/cts/AudioTrackTest.java
8c12ae8cced9bb5e45a331aba7ded97626c94df2 22-Dec-2010 James Dong <jdong@google.com> Fixed a cts issue where camera id was not passed to get the profile.

As a result, a non-existing profile (720p) is used to verify
the FRONT camera's camcorder profile

bug - 3306248

Change-Id: I31da801895712bf2eb6a17f358b0455305bc8991
rc/android/media/cts/CamcorderProfileTest.java
20a252994ae0c0ef668e23bd296581f3bc2f4915 20-Dec-2010 Christer Fletcher <christer.fletcher@sonyericsson.com> Corrected android.media.cts.AudioEffectTest#test1_0ConstructorFromType

The test case queries for all effects and then tries to recreate them
by using the type uuid of the effect. This however failed for effects
that did not implement a standard type. These effects will have their
type set to AudioEffect.EFFECT_TYPE_NULL and thus reconstruction of
them would fail. Made the test skip effects that has this NULL type.

Change-Id: I352844a473a174c2fbf7d37fc0f40923c00b957b
rc/android/media/cts/AudioEffectTest.java
61aeb1732d595c20ba927595683720f8787c29b7 15-Dec-2010 Eric Laurent <elaurent@google.com> Fix issue 2676107.

Added test for maximum record start time on devices claiming
PackageManager.FEATURE_AUDIO_LOW_LATENCY feature.

Change-Id: I284e1ba241677c48d3e9ad237e4276fdbdc10fcd
rc/android/media/cts/AudioRecordTest.java
d92f7f47f46a35aff355a0deeed607d7f5b61e48 14-Dec-2010 James Dong <jdong@google.com> Fix the broken build due to a typo. forgot to update the patch.

Change-Id: I42d2e63792de211eb5ed1c6c3c473f3bd5a6ad7e
rc/android/media/cts/CamcorderProfileTest.java
9b091b6ac5afb3b45bc181ddd2096ca92ea0ea66 14-Dec-2010 James Dong <jdong@google.com> Fixed a cts issue where 480p was considered as 720x480 only

bug - 3281711

Change-Id: I67f96e073c5d6e0acb8ac9cfc76a439d870f6bc0
rc/android/media/cts/CamcorderProfileTest.java
c8c148b4842aebc02df1f92ad8f0f829eb4a339f 03-Dec-2010 James Dong <jdong@google.com> Check whether the video resolutions in camcorder profiles are supported

Change-Id: I4a95f9471a749b8cd7d7eb8299981baa9d615bf4
rc/android/media/cts/CamcorderProfileTest.java
fe9c09d9f75f4b54b48e34f6cc611c6bebdc7c88 15-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Update audio mode tests for MODE_IN_COMMUNICATION

Change-Id: Id118c84285710d99d0b34ae46fdfbe92eefecc1b
rc/android/media/cts/AudioManagerTest.java
fff6d1050947d5bf689e945f339580188acfe0ba 25-Oct-2010 Brian Muramatsu <btmura@android.com> am 2ed6e0c5: am 9b6b5c2e: am 92ce9179: am e3e0586d: Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo

Merge commit '2ed6e0c56be121344473d2e12033ec0c66ecd0d6'

* commit '2ed6e0c56be121344473d2e12033ec0c66ecd0d6':
Fix RingertoneManagerTest#testStopPreviousRingtone
9b6b5c2ef892bbe430d5d2c288e53e64cf952820 25-Oct-2010 Brian Muramatsu <btmura@android.com> am 92ce9179: am e3e0586d: Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo

Merge commit '92ce917927034ee5504c43db2269313b8d940585' into gingerbread

* commit '92ce917927034ee5504c43db2269313b8d940585':
Fix RingertoneManagerTest#testStopPreviousRingtone
9f9e3358ecbb8f54dafa827f5be5b0bd188fade9 23-Oct-2010 Brian Muramatsu <btmura@android.com> Fix RingertoneManagerTest#testStopPreviousRingtone

Bug 2893018

Use adjustStreamVolume to get the device out of vibrate mode,
so that isPlaying will return true when its supposed to.

Change-Id: Ie86b0781d5c39dfcbc6e15c79c07fc67109896bc
rc/android/media/cts/RingtoneManagerTest.java
504f31555ff51d4fc3aacc14ba398fad202ce002 23-Sep-2010 Eric Laurent <elaurent@google.com> am c450359d: am 1007a8dc: Merge "Fix issue 3022800." into gingerbread

Merge commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290'

* commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290':
Fix issue 3022800.
df3ead7879a0bc042ab677ef2783fdfd912c0f18 22-Sep-2010 Eric Laurent <elaurent@google.com> Fix issue 3022800.

Created sub-package android.media.audiofx for audio effects.

Change-Id: I63e1b110a3a07d4eb5fe93d4c2217a0251f9b924
rc/android/media/cts/AudioEffectTest.java
rc/android/media/cts/BassBoostTest.java
rc/android/media/cts/EnvReverbTest.java
rc/android/media/cts/EqualizerTest.java
rc/android/media/cts/PresetReverbTest.java
rc/android/media/cts/VirtualizerTest.java
rc/android/media/cts/VisualizerTest.java
11e95f600b7fac915a820d68ddd2b4855e2a68d0 17-Sep-2010 Nipun Kwatra <nkwatra@google.com> Adding tests for time lapse.

Added tests for the time lapse CamcorderProfiles.
Also unified id and non-id cases.

Change-Id: I413ecd7bdc25b0e145dd4847c4ec0c9ab9c54429
rc/android/media/cts/CamcorderProfileTest.java
8ff01200e79a2f59866844f0399b495d4b6b4bda 07-Sep-2010 Eric Laurent <elaurent@google.com> Added tests for audio effects.

AudioEffectTest.java: tests for base AudioEffect class.
BassBoostTest.java: tests for bass boost effect
EnvReverbTest.java: tests for environmental reverb
PresetReverbTest.java: tests for preset reverb
VirtualizerTest.java: tests for virtualizer
VisualizerTest.java: test for visualizer

There is no requirement on the quality of audio effects or the supported parameter ranges.
The tests just ensure that the platform exposes and responds to all methods in effect APIs.

Change-Id: Ibdd0bf937c30ce000184e0bdf2323655ebf1d839
rc/android/media/cts/AudioEffectTest.java
rc/android/media/cts/BassBoostTest.java
rc/android/media/cts/EnvReverbTest.java
rc/android/media/cts/EqualizerTest.java
rc/android/media/cts/PresetReverbTest.java
rc/android/media/cts/VirtualizerTest.java
rc/android/media/cts/VisualizerTest.java
96773c4b8bcb09c3d91b7d1c8053fb155d539196 27-Aug-2010 Eric Laurent <elaurent@google.com> Added tests for Equalizer audio effect

Change-Id: Iaa8ddbd15b3c1d3ddd14f1e626e1881a20fcf7a0
rc/android/media/cts/EqualizerTest.java
0b9af2bbfed89d0803a594a0ead2062521f4ef30 20-Jul-2010 James Dong <jdong@google.com> Use QCIF as the default video resolution, rather than QVGA

- The reason behind this change is that QCIF is more widely supported than
QVGA. For instance, in H263 standard, QCIF is one of the 5 standard video
resolutions that all encoders support, while QVGA is one of the custom
video resolution. It is not reasonable to request all encoders to support
QVGA video resolution.

Change-Id: I897df3265d1e75c3935c81cb7e0d91c6259f4d52
rc/android/media/cts/MediaRecorderTest.java
2911e8d121d95dba6f11acb437374ae38f5b1f7b 12-Jul-2010 Yu Shan Emily Lau <yslau@google.com> Added the test template for the video editor.

Change-Id: I766de4eea8728a1cf82740c551e385a379852d72
rc/android/media/cts/VideoEditorTest.java
53e475fc35cf8766d2ce478d0f3d39bfd165da96 24-Jun-2010 Chih-Chung Chang <chihchung@google.com> Add tests for MediaProfiles.

Change-Id: I08e5e66615e88a243d5779ae02a3a68ba15d6b29
rc/android/media/cts/CamcorderProfileTest.java
rc/android/media/cts/CameraProfileTest.java
81e47592b89cb19993852e244e0992c15c992035 29-Apr-2010 Daniel Sandler <dsandler@android.com> Update CTS to reflect recent vibration fixes.

Pre-Froyo, if you set VIBRATE_TYPE_RINGER to
VIBRATE_SETTING_OFF, incoming calls would still vibrate if
the device was in RINGER_MODE_VIBRATE. This was fixed in
https://android-git.corp.google.com/g/#change,48440 so that
VIBRATE_TYPE_RINGER trumps; this is because we're now
properly treating RINGER_MODE_VIBRATE as sort of an upper
bound: vibrations are *permitted* but not *required*.

Bug: 2639299
Change-Id: I44401d4a9d73fa43e9152da9ffefc6706aa59429
rc/android/media/cts/AudioManagerTest.java
746550f20e2d212a6207cb87282524e44269ab81 13-Apr-2010 Glenn Kasten <gkasten@google.com> Try to fix test null pointer bug.

Change-Id: Ie221af8f47b1e6449528a90ce2de3313ad8cc525
rc/android/media/cts/RingtoneManagerTest.java
b4423a9d661ba6f2707270bdac0208a006a8b161 02-Apr-2010 Glenn Kasten <gkasten@google.com> Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo
cc01a6b7c70150a6609908fbd225c4feda5b78a9 01-Apr-2010 Glenn Kasten <gkasten@google.com> Use a fixed ringtone provided with the test case in resource folder.
Bug: 2557533

The file was created using the command: "sox -n -r 8000 -c 1 john_cage.ogg trim 0 433".
This solves the problem of being dependent on the current OEM ringtone in position 0,
and the length is long enough that isPlaying() should still be true.

Change-Id: Ic7e304cf3892fee6de02707bf57efc1b00c7e152
es/raw/john_cage.ogg
rc/android/media/cts/RingtoneManagerTest.java
06514aa859d54f3f1560345a0d7c839189d9c901 01-Apr-2010 Glenn Kasten <gkasten@google.com> Change test case to match new API behavior.
Bug: 2557533

Change-Id: I4eadb1fc9d4418c3d7a19a236dce1839bc315cd2
rc/android/media/cts/AudioManagerTest.java
0538d1fdd5bc6f07f512a2787036426f8acd5701 18-Mar-2010 Brett Chabot <brettchabot@android.com> Adjust AudioManagerTest#testVolume to check for new silent vs vibrate behavior.

Since System.VIBRATE_IN_SILENT is not part of public API, test has been changed
to check that either vibrate or silent mode is active when volume is adjusted
to zero.

Related framework changes:
I14cf91b0

Change-Id: I4e61705c7177601c6251a1a13198ce0f4f19bf69
rc/android/media/cts/AudioManagerTest.java
1c722c1b48467a4c9f5faf1112e8f19f953588b7 06-Mar-2010 James Dong <jdong@google.com> Fix a CTS test case where MediaRecorder.setMaxFileSize() assumes that
the output file size never exceeds the specified/target max size.

The fix is to give a tolerance to the target max file size.

- fix a typo
- rebased

bug - 2492800

Change-Id: I661a843c59f4250ce1dadada1c8f68d55de2487a
rc/android/media/cts/MediaRecorderTest.java
9ab726de2072385128274d559dbd18ae9e10e7ed 12-Feb-2010 Eric Laurent <elaurent@google.com> Fix issue 2087828: AudioTrackTest uses harcoded frame count value.

Do not compare getNativeFrameCount() to a hardcoded value but to actual frame count
requested when the AudioTrack is opened.
rc/android/media/cts/AudioTrackTest.java
d1225c04b8c096720de081272bcb2da052ceeb4b 03-Feb-2010 Gloria Wang <gwang@google.com> Fix for NullPointerException in CTS media test.
rc/android/media/cts/MediaPlayerTest.java
0c88aba34a61e2638a2cfe9345b437dd1d9a1fd3 19-Dec-2009 Gloria Wang <gwang@google.com> Register a callback for video size change in testPlayVideo.
rc/android/media/cts/MediaPlayerTest.java
7576523d335b09843f4ec600540127e8ab180999 03-Nov-2009 Brett Chabot <brettchabot@android.com> Fix AudioManager#testRouting.

Bug 2136268
rc/android/media/cts/AudioManagerTest.java
4d65de727e2a9de8710ed9b6e057deaa59f91fe8 09-Oct-2009 Brett Chabot <brettchabot@android.com> am adc7d0c6: Merge change 25642 into donut-gms

Merge commit 'adc7d0c6908953534ab83ab0fc0f43bdb929dd7e' into eclair

* commit 'adc7d0c6908953534ab83ab0fc0f43bdb929dd7e':
CTS: Fix AudioTrackTest#testAudioTrackProperties.
89d3a8fc681cb6eb5084629e67c5c57d22eed468 30-Sep-2009 Gloria Wang <gwang@google.com> Add new longer mp3 file testmp3_2.mp3 for testPlayAudio.
rc/android/media/cts/MediaPlayerTest.java
d099bbd2d2be3a84379d72dda33875cf4fc4ea40 18-Sep-2009 Brett Chabot <brettchabot@android.com> CTS: Fix AudioTrackTest#testAudioTrackProperties.

Change to test for min nativeFrameCount threshold rather than absolute.
BUG 2087828
rc/android/media/cts/AudioTrackTest.java
8ab9921ba3e42f8ad17078e123aada5a2d845389 12-Sep-2009 Brett Chabot <brettchabot@android.com> Change CTS tests to not build against SDK.

Most CTS test packages reference test related annotations in dalvik.annotation
which are not part of SDK. This was previously allowed due to bug in build
build system. For now, temporarily change CTS makefiles so they are not built
against SDK.

BUG 2114936
ndroid.mk
5a54633fc208901d99b9b1283f2858dc6e330a0e 28-Aug-2009 Brett Chabot <brettchabot@google.com> Change CTS makefiles so apps are built in data not system partition.

BUG 2053298

Change-Id: I2c541c03f7c33c69cde7b0567b080710658c8d28
ndroid.mk
f9e03e13a89a7c1ef27571bf779c06b6f0808727 14-Aug-2009 Brett Chabot <brettchabot@google.com> Remove a bunch of unused CTS tests from continuous test build to save space.

BUG 2053298
ndroid.mk
488336cb81ebc7b179544252c186ccdc02b9e073 11-Aug-2009 Brett Chabot <brettchabot@google.com> Disable/fix more CTS tests.

Marked as BrokenTest:
- LauncherActivityTest#testLaunchActivity. BUG 2028339
- SearchManagerTest testStartSearch and testStopSearch. BUG 2041610
- AudioManagerTest#testMuteSolo. BUG 2041773
- LayoutTest#testGetLineMax and testGetLineWidth. BUG 1937126
- GalleryTest#testSetCallbackDuringFling. BUG 1937126
- MediaStore_Audio_Playlists_MembersTest#testGetContentUri: BUG 2017132
Marked as ToBeFixed:
- ProgressBarTest#testAccessInterpolator. BUG 2031844
Fixes:
- RemoteViewsTest#testSetImageViewUri and testSetUri: Tests were using a non-
existent temporary file location. BUG 2042235
rc/android/media/cts/AudioManagerTest.java
1d13499026bba29d2bc144511eb73ec99d02d9aa 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9171 into donut

* changes:
Integrate unsubmitted cupcake change 148896: CTS: add testcases for android.media.JetPlayer
b0b0cc01c53f6244e3ba2f676ed96c8d81f28dec 30-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9217 into donut

* changes:
CTS: Clean up image resources
4aaf3a8d3c9e68a11020b23d95eeb905197deda0 30-Jul-2009 Phil Dubach <phillipd@google.com> CTS: Clean up image resources

Replace images of unknown origin and rename baby_face.jpg.
rc/android/media/cts/FaceDetectorTest.java
de369742c66ba236a4e00c0d1b66fc468e431c20 27-Jul-2009 Phil Dubach <phillipd@google.com> Integrate unsubmitted cupcake change 143598:
CTS: add testcase for AudioRecord, MediaPlayer and MediaRecorder
rc/android/media/cts/AudioRecordTest.java
rc/android/media/cts/MediaPlayerTest.java
rc/android/media/cts/MediaRecorderTest.java
62481a9f78fa97e23d11fd54e49974a9243889f9 30-Jul-2009 Phil Dubach <phillipd@google.com> Integrate unsubmitted cupcake change 148896:
CTS: add testcases for android.media.JetPlayer
rc/android/media/cts/JetPlayerTest.java
adffe61684541707a5800a0e5b35db584f45287b 24-Jul-2009 Phil Dubach <phillipd@google.com> Integrate unsubmitted cupcake change 148895:
CTS: add new testcases for android.media.AudioTrack
rc/android/media/cts/AudioTrackTest.java
rc/android/media/cts/AudioTrack_ListenerTest.java
0e70562f5d00a7a2329670d552c6f6d109002b83 23-Jul-2009 Phil Dubach <phillipd@google.com> Integrate unsubmitted cupcake change 131600:
CTS: add test cases for media.Ringtone and RingtoneManager
rc/android/media/cts/RingtoneManagerTest.java
rc/android/media/cts/RingtoneTest.java
03ed42d0263f4e935b5cf313dfa9c72cc97373f6 16-Jul-2009 Phil Dubach <phillipd@google.com> Integrate unsubmitted cupcake change 131603:
CTS: add test cases for media.FaceDetector, MediaScannerConnection and SoundPool
rc/android/media/cts/FaceDetectorTest.java
rc/android/media/cts/FaceDetector_FaceTest.java
rc/android/media/cts/MediaScannerConnectionTest.java
rc/android/media/cts/SoundPoolTest.java
10aacddbf7cf11cb20b154f7b8c046d7c856d273 10-Jul-2009 Phil Dubach <phillipd@google.com> Integrate unsubmitted cupcake change 131148:
CTS: add test cases for media.AsyncPlayer, AudioManager and ToneGenerator
ndroid.mk
ndroidManifest.xml
rc/android/media/cts/AsyncPlayerTest.java
rc/android/media/cts/AudioManagerTest.java
rc/android/media/cts/ToneGeneratorTest.java