225 Commits

Author SHA1 Message Date
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
Yu Shan Emily Lau
d3b0d642c9 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.

	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-31 11:57:30 -07:00
Daniel Sandler
c035f7c79f Final high-density frameworks artwork drop from designers (dated 25-Aug-2009). 2009-08-28 09:04:53 -04:00
Yu Shan Emily Lau
523018f182 am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:42:02 -07:00
Yu Shan Emily Lau
b56de7474d Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
This reverts commit 051d8d6692a4f8d852f6336d1e31a3a907913ac7.
2009-08-25 10:21:31 -07:00
Yu Shan Emily Lau
b91c52f773 am 8c937a17: Merge change 22379 into donut
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:14:25 -07:00
Yu Shan Emily Lau
051d8d6692 modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.

	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-21 19:20:42 -07:00
Sahil Sachdeva
c9706f0262 DO NOT MERGE, ALready merged to master.
1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
2009-08-14 14:52:23 -07:00
Yu Shan Emily Lau
6874e3df0e am 3397f169: Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.
Merge commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82'

* commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82':
  Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.
2009-08-06 18:14:39 -07:00
Yu Shan Emily Lau
3397f16949 Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops. 2009-08-06 17:42:29 -07:00
Yu Shan Emily Lau
859c37548f am bd014e07: Remove the memory capture in the first run and make it the same as the cupcake test case.
Merge commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e'

* commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e':
  Remove the memory capture in the first run and make it the same as the cupcake test case.
2009-08-05 12:16:18 -07:00
Yu Shan Emily Lau
bd014e07e2 Remove the memory capture in the first run and make it the same as the cupcake test case. 2009-08-05 11:44:51 -07:00
Eric Laurent
a553c25b33 Fix issue 1795088 Improve audio routing code
Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
2009-07-23 06:03:39 -07:00
niko
bc72692780 Added native metadata support.
Metadata.java:
Fixed typo 8k != 8092. The comment was correct though.

In Metadata.h, the new Metadata class is declared in the ns android::media
to limit the chances of conflict with other packages.

The MetadataType in MediaPlayerInterface is gone and moved to Metadata as
an inner typedef.

Similarly the SortedVector<MetadataType> instance have been replace by a
new type Metadata::Filter.

All the keys declared in the java counterpart are also in Metadata.h.

Metadata.cpp:
Contains the implementation of the native metadata packing.

There an associated change in the opencore package that should go in
at the same time as this one.
2009-07-22 15:03:22 -07:00
niko
6fa41bbb56 Minor cleanup in Metadata.java
Use a constant to express the size of a 32bits int.

In MediaPlayerMetadataParserTest, removed unused kTocken constant.
2009-07-20 13:53:29 -07:00
niko
c39173be32 Fixed a bug in the parser.
When we parse the metadata we check that there is enough data in the parcel by checking
 the byte availables and the size in the header.
Since the size is in the header has been read, we should make sure than dataAvailable() >= size - 4

This bug was hidden by some test code which has been removed.
2009-07-20 13:10:01 -07:00
Android (Google) Code Review
cf541ee116 Merge change 7617
* changes:
  Added method to get metadata out of the player.
2009-07-17 13:19:32 -07:00
niko
8994837f27 Added method to get metadata out of the player.
The method passes a list of metadata ids to be retrieved and
a parcel where the metadata records should be appended.

If the list of ids is empty, all the metadata should be returned.
2009-07-17 11:31:11 -07:00
Nicolas Catania
cb2e00eedc Impl. of the metadata getters.
In Metadata, implemented the method that unmarshall the data from
a metadata parcel an return java entities.

Add 2 new types of metadata (Boolean and Date) and fixed an issue
in TimedText: the w3c standard specify a duration as well as the
time to be played => added a duration field.

In MetadataParserTest.java:
Moved the util private methods at the bottom of the file.
Added new tests for the getters (GETTERS section)
2009-07-16 18:34:53 -07:00
Android (Google) Code Review
52e4ad89ad Merge change 7399
* changes:
  Partial implementation of the parsing of Parcel into Metadata.
2009-07-16 11:55:45 -07:00
Nicolas Catania
8f5fcab05f New test player stub to load mock native players.
Added a new class TestPlayerStub that takes a magic url in the setDataSource call.
Based on the value of the url, the stub is going to load a DL and create the concrete
player used during the test.
After these initialization steps TestPlayerStub is just a wrapper.

Added a new functional test MediaPlayerInvokeTest to demonstrate how a new
mock player to test the invoke method can be loaded.

Added a new mock player for the invoke test: invoke_mock_media_player.cpp.
2009-07-16 11:22:31 -07:00
Nicolas Catania
a5ccb22a3d Partial implementation of the parsing of Parcel into Metadata.
In this first cut, a raw parcel is parsed to check that the overall
format is correct.

At the same time, we record the metadata seen and their position in
the parcel for later retrieval using the get* methods.

This means that the 'has' method to check the existence of a metadata
should work.

Removed size and iterator methods. Instead, I added a new method
to give access to the set of keys. The user can make use of the set
to call size(), empty(), iterator() etc...
2009-07-15 13:27:49 -07:00
Android (Google) Code Review
8529fc3a15 am 2f8d58b7: Merge change 5420 into donut
Merge commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede'

* commit '2f8d58b7ae2b9dc60eed83e5dddc8c28223e1ede':
  Added two test cases to trace the failure in closing the hw decoder and the current playtime is greater than the duration.
2009-07-01 14:18:45 -07:00
Yu Shan Emily Lau
f47b8e991f Added two test cases to trace the failure in closing the hw decoder and the current playtime is greater than the duration. 2009-06-30 11:13:06 -07:00
Android (Google) Code Review
567c2e22aa am 9efba9d2: Merge change 5176 into donut
Merge commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9'

* commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9':
  Export the output to a text file and save to sdcard
2009-06-24 13:12:37 -07:00
Android (Google) Code Review
9efba9d29f Merge change 5176 into donut
* changes:
  Export the output to a text file and save to sdcard
2009-06-23 19:51:00 -07:00
Yu Shan Emily Lau
f16da13585 Export the output to a text file and save to sdcard 2009-06-23 19:36:43 -07:00
Android (Google) Code Review
6922f19d30 am 843f5eb3: Merge change 5054 into donut
Merge commit '843f5eb36a67367ae76800f74e184f00af50ef54'

* commit '843f5eb36a67367ae76800f74e184f00af50ef54':
  Rollback the number of loop in the memory stress test
2009-06-23 13:08:18 -07:00
Yu Shan Emily Lau
327420252c Rollback the number of loop in the memory stress test 2009-06-22 21:19:53 -07:00
Android (Google) Code Review
949070dd74 am 11348cff: Merge change 4885 into donut
Merge commit '11348cffef46585027ba3035357370177a554826'

* commit '11348cffef46585027ba3035357370177a554826':
  Merge the output file into one.
2009-06-22 19:47:35 -07:00
Yu Shan Emily Lau
a74603052b Merge the output file into one. 2009-06-22 14:50:25 -07:00
Android (Google) Code Review
1ecb750f65 am 1d7d5db7: Merge change 3799 into donut
Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf'

* commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf':
  Turned on the windows media related test cases as the binary already integrated.
2009-06-10 17:20:04 -07:00
Yu Shan Emily Lau
afbc17ead2 Turned on the windows media related test cases as the binary already integrated. 2009-06-10 15:46:32 -07:00
Android (Google) Code Review
8c09399490 am bdf90a08: Merge change 3462 into donut
Merge commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3'

* commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3':
  Capture the memory output before the playback and record start.
2009-06-08 11:59:12 -07:00
Yu Shan Emily Lau
32e959163f Capture the memory output before the playback and record start. 2009-06-08 11:29:55 -07:00
Android (Google) Code Review
7c49790cde am 162c9d0e: Merge change 2805 into donut
Merge commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47'

* commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47':
  base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
2009-06-01 10:01:08 -07:00
San Mehat
5a3a77dabd base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
Signed-off-by: San Mehat <san@google.com>
2009-06-01 09:25:28 -07:00
Android (Google) Code Review
b86204a73d am 2af7e639: Merge change 2654 into donut
Merge commit '2af7e639906981b1562f3187a60b6c848b7da17c'

* commit '2af7e639906981b1562f3187a60b6c848b7da17c':
  Added the two validations for the memory stress test
2009-05-28 19:08:44 -07:00
Yu Shan Emily Lau
01c0596b75 Added the two validations for the memory stress test
1) Set the maximum memory leakage to 150K in 200 loops of playback.
2) Check the pid of the meidaserver.
2009-05-28 18:59:33 -07:00
Android (Google) Code Review
c6b58959b3 am 379d3bd9: Merge change 2016 into donut
Merge commit '379d3bd974cfde9480fda733d4f442311924cbb9'

* commit '379d3bd974cfde9480fda733d4f442311924cbb9':
  Replaced the old test media files with the new open source test media files.
2009-05-19 16:52:31 -07:00
Android (Google) Code Review
379d3bd974 Merge change 2016 into donut
* changes:
  Replaced the old test media files with the new open source test media files. Fix the bug in testGetThumbnail test.
2009-05-19 16:51:29 -07:00
Yu Shan Emily Lau
be467b579e Replaced the old test media files with the new open source test media files.
Fix the bug in testGetThumbnail test.
2009-05-19 15:46:22 -07:00
Android (Google) Code Review
6a88955135 am 988c4d1a: Merge change 2005 into donut
Merge commit '988c4d1a3ece97c078658a67b15949db900641e0'

* commit '988c4d1a3ece97c078658a67b15949db900641e0':
  Added the write sdcard permission so that the mediarecorder test
2009-05-19 15:22:35 -07:00
Yu Shan Emily Lau
f30c700e13 Added the write sdcard permission so that the mediarecorder test
can write the new recorded video into sdcard.
2009-05-19 15:14:51 -07:00
Android (Google) Code Review
86a99b9ad2 am b3af6b48: Merge change 1748 into donut
Merge commit 'b3af6b4805040ea42c01765387c99089822bbe7e'

* commit 'b3af6b4805040ea42c01765387c99089822bbe7e':
  Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
2009-05-15 16:25:42 -07:00
Xia Wang
55eef638fa Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file. 2009-05-15 15:03:33 -07:00