Merge commit '47f1d4d509b271ddb2f158c761e572413f39f1a8'
* commit '47f1d4d509b271ddb2f158c761e572413f39f1a8':
Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
Merge commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23'
* commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23':
1) Capture the start memory before the test started
Merge commit '8445f367070514dce3154be73827107b8a93f234' into eclair-mr2
* commit '8445f367070514dce3154be73827107b8a93f234':
1) Capture the start memory before the test started
1) Add the include path for jni.h.
2) Rename InitCheck() and read_at() to initCheck() and readAt(),
repectively in StreamSource, as done in DataSource.
3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
Need to do so because SkJPEGImageDecoder is not defined in a header file.
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2
* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
Merge commit '28b0e311959baa55e0c6c9762831165dbafb5046'
* commit '28b0e311959baa55e0c6c9762831165dbafb5046':
Check whether test server is up before running tests which use streaming files.
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2
* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
Check whether test server is up before running tests which use streaming files.
Merge commit '421a32fb31f46860ce77b0e8131178a0af52d087'
* commit '421a32fb31f46860ce77b0e8131178a0af52d087':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2
* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'
* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
Add windows media support check in MediaMetadataRetrieverTest
Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2
* commit 'f67eff177515baa421d8717ee20efdc516fde580':
Add windows media support check in MediaMetadataRetrieverTest
Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695'
* commit 'f97dec837c1fa47250af023bbaea0566a0ec9695':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d'
* commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11'
* commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11':
Fixed the long recorder time and reduce the number of loops.
Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'
* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
Turn on thubmnail capture unit test for media metadata retriever
Merge commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb'
* commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb':
Added the checking for the wma in the memory test.
Merge commit '99c156cd9ff67119e20d4ebc851998d68492da05'
* commit '99c156cd9ff67119e20d4ebc851998d68492da05':
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases.
3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
Merge commit '58c243450d054893c234159ea62262c7f2c0a139'
* commit '58c243450d054893c234159ea62262c7f2c0a139':
There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension