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
Merge commit '5813b3097451dc4d061eb75e5479e4ea15d886c7'
* commit '5813b3097451dc4d061eb75e5479e4ea15d886c7':
Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
Merge commit '667bc1e862c5e6b2a703846e786bf0b624830da8'
* commit '667bc1e862c5e6b2a703846e786bf0b624830da8':
Modified the validation to use singal media player instance.
Added the error callback to handle the media server crash.
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
Add StreamSource, which wraps a SkStream to a DataSource.
Add SkOmxPixelRef, which holds a MediaBuffer.
Test OmxJpegImageDecoder by a Jpeg decoder bench.
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
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
* 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.
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
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Merge commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82'
* commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82':
Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.
Merge commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e'
* commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e':
Remove the memory capture in the first run and make it the same as the cupcake test case.
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()
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.
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.
