120 Commits

Author SHA1 Message Date
Gloria Wang
5cfcedc540 am 28b0e311: am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair
Merge commit '28b0e311959baa55e0c6c9762831165dbafb5046'

* commit '28b0e311959baa55e0c6c9762831165dbafb5046':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:14:46 -08:00
Gloria Wang
9d7e75eb0c am bf964e6a: Merge change Ic060d86f into eclair
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:07:10 -08:00
Gloria Wang
c060d86f7d Check whether test server is up before running tests which use streaming files. 2009-11-09 15:51:12 -08:00
James Dong
b09c8ba082 am 421a32fb: am 99588d59: am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '421a32fb31f46860ce77b0e8131178a0af52d087'

* commit '421a32fb31f46860ce77b0e8131178a0af52d087':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 20:18:19 -08:00
James Dong
99588d590f am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2

* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 19:09:58 -08:00
James Dong
b1c85ec47a Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java 2009-11-04 23:00:09 -08:00
James Dong
ffca760612 am 76370140: am 9d4dcf28: am f67eff17: Merge change Ib0036762 into eclair
Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'

* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:46:36 -08:00
Brett Chabot
a98c5675d2 am 64e648fd: am b580d53e: am 774d956d: Merge change Ic8c7ca7b into eclair
Merge commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1'

* commit '64e648fdd93c9642bdbda3e44082e50f4baeb0c1':
  Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
2009-11-02 17:46:12 -08:00
James Dong
9d4dcf287c am f67eff17: Merge change Ib0036762 into eclair
Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2

* commit 'f67eff177515baa421d8717ee20efdc516fde580':
  Add windows media support check in MediaMetadataRetrieverTest
2009-11-02 17:19:51 -08:00
Android (Google) Code Review
f67eff1775 Merge change Ib0036762 into eclair
* changes:
  Add windows media support check in MediaMetadataRetrieverTest bug 2232274
2009-11-02 20:13:20 -05:00
Android (Google) Code Review
d6af2e0cbf Merge change I43a335c3 into eclair
* changes:
  Suppress takePicture test from continuous DO NOT MERGE.
2009-11-02 20:08:16 -05:00
James Dong
38b03a7661 Add windows media support check in MediaMetadataRetrieverTest
bug 2232274
2009-11-02 12:20:58 -08:00
Brett Chabot
43a335c3cc Suppress takePicture test from continuous DO NOT MERGE.
Bug 2141755
2009-10-30 17:07:03 -07:00
Brett Chabot
c8c7ca7bd7 Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
This test causes the whole suite to hang.
2009-10-30 16:48:09 -07:00
Yu Shan Emily Lau
79e56a215e am f97dec83: am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695'

* commit 'f97dec837c1fa47250af023bbaea0566a0ec9695':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 23:53:27 -07:00
Yu Shan Emily Lau
13b93713f3 Fixed the H263 video duation which caused the incorrect video validation. 2009-10-26 18:04:11 -07:00
Yu Shan Emily Lau
c2f945c047 am c3d8f16a: am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d'

* commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:55:16 -07:00
Yu Shan Emily Lau
999101368f 1) Add 10 seconds wait time before collecting the end memory.
2) Modified the player stress test, shorten the plabyack time.
2009-10-15 18:52:31 -07:00
Yu Shan Emily Lau
f2496dc8b9 am f1fa1eac: am edd942c2: Merge change I55a6ac8c into eclair
Merge commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11'

* commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11':
  Fixed the long recorder time and reduce the number of loops.
2009-10-01 11:49:46 -07:00
Yu Shan Emily Lau
55a6ac8c54 Fixed the long recorder time and reduce the number of loops. 2009-09-29 21:38:39 -07:00
James Dong
d4a9711057 am 9365c8fa: am 99638e74: Merge change 27466 into eclair
Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'

* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:53:55 -07:00
James Dong
525ad18663 Turn on thubmnail capture unit test for media metadata retriever 2009-09-28 10:57:17 -07:00
Yu Shan Emily Lau
0a63934d97 am 20f8fcd9: am 7756cbee: Merge change 27073 into eclair
Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63'

* commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63':
  Removed the device type checking
2009-09-27 15:42:30 -07:00
Yu Shan Emily Lau
34831c9330 Removed the device type checking 2009-09-25 16:01:20 -07:00
Yu Shan Emily Lau
f5171c13a1 am 384350e8: am 3f790d87: Merge change 27011 into eclair
Merge commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb'

* commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb':
  Added the checking for the wma in the memory test.
2009-09-25 11:22:58 -07:00
Yu Shan Emily Lau
50ee15793b am 99c156cd: am 7d0bdfaf: Merge change 26948 into eclair
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
2009-09-25 11:14:52 -07:00
Yu Shan Emily Lau
a56e653130 Added the checking for the wma in the memory test. 2009-09-25 00:07:47 -07:00
Yu Shan Emily Lau
5b0b63b674 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 2009-09-24 16:17:14 -07:00
Yu Shan Emily Lau
f97eb8f932 am 5653e41e: am 008fc5d1: Merge change 26332 into eclair
Merge commit '5653e41e71a07c104da3f01e5a022198ee39dafe'

* commit '5653e41e71a07c104da3f01e5a022198ee39dafe':
  1) Add the wma / wmv profile reader.
2009-09-23 11:30:58 -07:00
Yu Shan Emily Lau
dc1af5befa 1) Add the wma / wmv profile reader.
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.
2009-09-22 10:52:56 -07:00
Yu Shan Emily Lau
f7e8872036 am 58c24345: am 92b27daf: Merge change 25858 into eclair
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
2009-09-18 20:19:00 -07:00
Yu Shan Emily Lau
ac11ffad0b am 5813b309: am e785d180: Merge change 25826 into eclair
Merge commit '5813b3097451dc4d061eb75e5479e4ea15d886c7'

* commit '5813b3097451dc4d061eb75e5479e4ea15d886c7':
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 18:16:38 -07:00
Yu Shan Emily Lau
17d7ea4947 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 2009-09-18 16:27:24 -07:00
Yu Shan Emily Lau
9d7b2fa808 Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore. 2009-09-18 14:58:56 -07:00
Yu Shan Emily Lau
baf71a65ab am 667bc1e8: am b39dcb79: Merge change 25722 into eclair
Merge commit '667bc1e862c5e6b2a703846e786bf0b624830da8'

* commit '667bc1e862c5e6b2a703846e786bf0b624830da8':
  Modified the validation to use singal media player instance.
2009-09-18 00:05:15 -07:00
Yu Shan Emily Lau
bc95d663ad Modified the validation to use singal media player instance. 2009-09-17 23:43:18 -07:00
Yu Shan Emily Lau
dd74c01efc am 64ea3d3f: am 56af9e9f: Merge change 25452 into eclair
Merge commit '64ea3d3fd847d5055a8a39b0cd7ff89c4beea042'

* commit '64ea3d3fd847d5055a8a39b0cd7ff89c4beea042':
  Modified the new stream video url.
2009-09-17 23:37:02 -07:00
Android (Google) Code Review
56af9e9f9c Merge change 25452 into eclair
* changes:
  Modified the new stream video url.
2009-09-18 02:20:43 -04:00
Yu Shan Emily Lau
182d75ec09 am 00e6beb6: am c82e65ae: Merge change 25228 into eclair
Merge commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1'

* commit '00e6beb6ea58516cf2ff03c03a4e9e35998432d1':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
2009-09-17 12:13:51 -07:00
Yu Shan Emily Lau
3aea463e3d am 036033fc: am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration
Merge commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b'

* commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-17 09:50:39 -07:00
Yu Shan Emily Lau
46a01f6303 am 44934f30: am 4d445d68: Merge change 24955 into eclair
Merge commit '44934f3042939decc61ab6335acbf111e3ca09d9'

* commit '44934f3042939decc61ab6335acbf111e3ca09d9':
  new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
2009-09-17 06:41:18 -07:00
Yu Shan Emily Lau
208ad8e413 Modified the new stream video url. 2009-09-16 23:16:44 -07:00
Android (Google) Code Review
b88ce51f1b Merge change 24674
* changes:
  Implement OmxJpegImageDecoder.
2009-09-16 23:48:19 -04:00
Yu Shan Emily Lau
20a6b955fe modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
Added the error callback to handle the media server crash.

	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
2009-09-15 21:42:07 -07:00
Yu Shan Emily Lau
610e3595d2 modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Fixed the meta data duration
2009-09-15 20:40:07 -07:00
Wei-Ta Chen
4b6f4942fc Implement OmxJpegImageDecoder.
Add StreamSource, which wraps a SkStream to a DataSource.
Add SkOmxPixelRef, which holds a MediaBuffer.
Test OmxJpegImageDecoder by a Jpeg decoder bench.
2009-09-16 01:21:00 +08:00
Yu Shan Emily Lau
1619367ab8 new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.

	new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
2009-09-14 16:27:34 -07:00
Yu Shan Emily Lau
147a0c270b modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
Fix the m4a1 duration and the also fix the random_seek time error in the stress test.

        modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
2009-09-11 16:37:42 -07:00
Yu Shan Emily Lau
bde54df020 modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Fixed the incorrect expected druation
2009-09-08 18:55:01 -07:00
Android (Google) Code Review
52d6245ba2 Merge change 22995 into eclair
* changes:
  	modified:   res/layout/surface_view.xml 	modified:   src/com/android/mediaframeworktest/MediaFrameworkTest.java 	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the async mp3 playback test case and also switch the base activity to full screen.
2009-08-31 12:07:07 -07:00