• Home
  • History
  • Annotate
  • only in /frameworks/wilhelm/tests/mimeUri/
History log of /frameworks/wilhelm/tests/mimeUri/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
5321b3665e1a538cdcf894dea99d15c10b18ccf8 14-Mar-2012 Glenn Kasten <gkasten@google.com> Prepare to move system/media

Change-Id: Iac6dcfb72753e53e9a42b5feeaa2d6523f2395a4
ndroid.mk
3df2017547e7c9b9818068fc6fd83f66fa58bdc1 03-Aug-2011 Glenn Kasten <gkasten@google.com> Update the URI slow-down (playback rate) test

Use prefetch status callback to detect bad URI and signal to main thread.
Check return value of GetFillLevel and GetPrefetchStatus.
Display rate capabilities in a nicely formatted way.
Fix compile warnings.

Change-Id: I3f96ceb72a7a17ffe3dbcdcbda7053b3e736eb12
lesTestSlowDownUri.cpp
c5479c4ca740a782d1ff4c82d1dc0f14de26962c 27-Sep-2011 Glenn Kasten <gkasten@google.com> Merge "Check result of GetFillLevel and GetPrefetchStatus"
b4bdbe2d5d308effc7b9368491b0224d5cce6c1b 22-Aug-2011 Glenn Kasten <gkasten@google.com> Check result of GetFillLevel and GetPrefetchStatus

Change-Id: I07e962526215cbfe6ecf39bd8d0029e2b345bef3
lesTestPlayUri.cpp
089a7c63adb033aec7b3200753e66b30ec8932be 29-Jul-2011 Glenn Kasten <gkasten@google.com> Return after prefetch error in get position test

Change-Id: I7de1ddd05e4d2115dc54215d62f8af76f6c352ff
lesTestGetPositionUri.cpp
68c8a1b6deea46eeca57848768a92e96d583aadd 25-Aug-2011 Jean-Michel Trivi <jmtrivi@google.com> Metadata keys for PCM decoding

Declare in a public header the metadata keys an application which
decodes audio data would use to figure out the output PCM format.

Make the SL ES Android header also include the configuration and
metadata headers.
Update test apps to reflect this.

Change-Id: I298db4fdb800df2d48047691441aa7489aad4822
lesTestPlayStreamType.cpp
56c5b9b986c00839e841f9660d9847173807a0c1 02-Aug-2011 Glenn Kasten <gkasten@google.com> Miscellaneous loop test improvements

Enable HEADATEND event to see whether looping causes that event.
Recover from prefetch errors using the new approach of condition signal rather than polling.
Check result returned by GetFillLevel.

Other changes:
- Make assert work.
- Pass NULL as 3rd parameter to RegisterCallback when context is not needed.
- Use CheckErr instead of assert when checking result codes.
- Add comments.

Change-Id: I972b9eca9836e62141b6a078345f091e60689321
ndroid.mk
lesTestLoopUri.cpp
c6853892c94800e72c0bd676d5d2136d48cea76e 19-Jul-2011 Glenn Kasten <gkasten@google.com> Use the documented header filenames

Both Khronos and we say to use < > in our docs

Change-Id: Ibf1d2b83036582a605aa6b9043210c89a4eb0e1e
lesTestGetPositionUri.cpp
lesTestLoopUri.cpp
lesTestManyPlayers.cpp
lesTestPlayStreamType.cpp
lesTestPlayUri.cpp
lesTestPlayUri2.cpp
lesTestSlowDownUri.cpp
lesTest_playStates.cpp
4b0e0b2860ffd5e246b42c8a434833cca2f068b3 08-Jul-2011 Jean-Michel Trivi <jmtrivi@google.com> Implement GetPosition for players playing from a URI/FD

AudioPlayer (OpenSL ES) and MediaPlayer (OpenMAX AL) that play
media from a URI or FD are implemented on top of an Android
MediaPlayer. This CL implements requesting the current position
from the underlying MediaPlayer object inside the event loop.
At this stage, GetPosition cannot be called from inside a
callback as the callback is made on the same thread that will
process the asynchronous part of the GetPosition implementation.
Add test app for GetPosition.

Change-Id: Ife768bc40e37fc60cc19f6ba84bbe6cb06cc6590
ndroid.mk
lesTestGetPositionUri.cpp
58432eb9cea995c69b4f905e68b38c1b8216edeb 13-Jun-2011 Glenn Kasten <gkasten@google.com> Better defaults and fix warnings

Use better defaults for slesTestFeedback rxBufCount and channel count.
Fix build warnings.

Change-Id: Ieef4750cbc454029e61524cc8011a6c774088762
lesTestLoopUri.cpp
lesTestPlayStreamType.cpp
lesTestPlayUri.cpp
lesTestPlayUri2.cpp
lesTestSlowDownUri.cpp
lesTest_playStates.cpp
2b750ac8e486b75a0f5755d4b595077ec525235e 02-Jun-2011 Jean-Michel Trivi <jmtrivi@google.com> Stress test for OpenSL ES: create and delete many players

Implementation of a test to deal with 40 AudioPlayers:
- creation
- realize
- configuration
- prefetching
- playback
- destruction
If a player was created, regardless of whether the other
operations were successful, it will be destroyed.
The number of players, 40, is chosen specifically because it
is larger than the number of objects Wilhelm is currently
capable of supporting, and larger than the number of tracks
supported by the platform mixer.

Change-Id: I42287039d59b77e59c60d074fbc0177d9726b359
ndroid.mk
lesTestManyPlayers.cpp
4ee246c55533bdab8ab5fa0f0581744fe58e7c91 29-Mar-2011 Jean-Michel Trivi <jmtrivi@google.com> Move support for SL URI and FD playback under GenericPlayer class

The SfPlayer class was implementing URI and FD decode and playback
in the application process. This CL removes this class entirely
and moves its functionality under the GenericPlayer class. This
means that the playback of URIs and FDs is now implemented through
an android::MediaPlayer object running in the media service.

The SfPlayer header had many StageFright and system includes, which
are now moved to the relevant files where they are required,
instead of automagically coming from sles_allinclusive.h.

Note that this CL breaks support for the following OpenSL ES features
due to missing Android MediaPlayer features:
SLPlayItf.GetPosition
HEADATMARKER
HEADATNEWPOSITION
SLVolumeItf.EnableStereoPosition
SetStereoPosition
SLMuteSoloItf
SLPlaybackRateItf

Support for those features will be reintegrated in subsequent CLs.

Change-Id: I8d7f6ea006eb7b876ef1ca1909d74b4517335850
lesTestPlayUri.cpp
262059f71a68edc5e510427c63f5f1623d3672a8 12-Jan-2011 Glenn Kasten <gkasten@google.com> Directory re-organization

Change-Id: I8e3f12a22e765d36ddefd87edf204735b25474f6
ndroid.mk
1d081e49a10543018e1ae33792bd3d30504719ba 05-Jan-2011 Glenn Kasten <gkasten@google.com> Squashed commit of 9 cherry-picks from master

Android SDK level report is the highest available

Fix bug in seek torture test
This was found because we now do better checking of data locators.

Comment out and decrease log level for play state

Improve error handling and help message in test

Include data source or sink name in log messages

Bug 3326605: AudioRecorder uses wrong channel mask

Don't overwrite previous error in locator check

OpenSLESUT.h is not (yet) a supported header
so remove the symlink from the SLES/ directory

Shared engine between OpenSL ES and OpenMAX AL
lesTestPlayStreamType.cpp
7126c25d7c037e5086216cf540ecf40779c3585a 13-Oct-2010 Glenn Kasten <gkasten@google.com> Bug 3102561 - Tests and examples only

Note: the modifications in directory libopensles aid testing,
but have no affect on production builds because they are related
to tracing, which is is disabled by default.

Update feedback test to be more reliable.
Update slesTestPlayUri to exit on prefetch error.
Clean up error and termination handling.
Add comment to record test on how to use it.
Reduce global symbol dependencies when trace is enabled.
Split OpenSLESUT into two files: part that uses printf, and another part that doesn't.
Add SL_RESULT_ prefix to result strings.
slesutResultToString returns NULL for unknown value.
Add multithread torture test.
Compile stream test for non-Android as a no-op.
Improve API test coverage.
Enable assertion checks on test programs.

Change-Id: I6b82026cfa19d2f08cda4c11137e0706e8ff4b8c
lesTestPlayStreamType.cpp
lesTestPlayUri.cpp
f536948a85be5e3f3731b64b01cfacdf90ed1157 12-Oct-2010 Jean-Michel Trivi <jmtrivi@google.com> Notify when prefetching fails

There is no event in the SLPrefetchStatus event callback in
OpenSL ES 1.0 to indicate a prefetch error. So we signal it by
sending simulataneously two events:
- SL_PREFETCHEVENT_FILLLEVELCHANGE with a level of 0
- SL_PREFETCHEVENT_STATUSCHANGE with a status of
SL_PREFETCHSTATUS_UNDERFLOW

Change-Id: I399ea3474e6cc7796c940401306ca9a076fac4e2
lesTestPlayUri.cpp
c2303eb5497c488db786dcb2b8514db229452536 11-Oct-2010 Glenn Kasten <gkasten@google.com> Test cleanup

Fix bug in QueryEffect test - was not re-initializing the name length.
Add QueryEffect test for over-writing the name buffer.
Don't create output with VOLUME or NULL interfaces.
Use <stdlib.h> symbolic names for exit codes instead of 0 and 1.
Remove Android-style logging from examples; use only printf.
Remove extra blank lines in test output.
Remove the MAX_NUMBER_OUTPUT_DEVICES macro.
Use <unistd.h> to declare usleep.
Remove obsolete #include statements.
Fix build warnings.

Change-Id: I8d198a317246b3894f104edf7c9f317a51593d07
ndroid.mk
lesTestLoopUri.cpp
lesTestPlayStreamType.cpp
lesTestPlayUri.cpp
lesTestPlayUri2.cpp
lesTestSlowDownUri.cpp
lesTest_playStates.cpp
8a1b7f28c1c3de212a302182022310ab7b227788 30-Sep-2010 Jean-Michel Trivi <jmtrivi@google.com> Lock tweak between interface and object

When locking the interface for the prefetch status, lock the
object instead of the prefetch interface, as it updates
the android object state.

Fix the playState test app.

Change-Id: Ib4e0e99a4cf0720e2b7ebd920fe92f69377f19d9
lesTest_playStates.cpp
24430c9070298f12e68b84c921add38da6ad0490 29-Sep-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix issues with SLPlaybackRateItf interface

Set rate was not applied when the AudioTrack is created after
prepare completed.
Modified playback rate functions in AudioPlayer to pass a
CAudioPlayer pointer, rather than a pointer to IPlaybackRate
so the rate update function can be queried from the CAudioPlayer.
Added test that exercises the SLPlaybackRateItf interface as
well as content looping.
Simplified evaluation of delay between decode and render to
use a fixed (small) delay that balances time to run the
event looper, and prevents clicks.

Change-Id: I598e9a96e93ef7a7c3603c8467f9d6b36dacd26d
ndroid.mk
lesTestSlowDownUri.cpp
3ddf7a34cc617e52a9b9a5593a0d1c5ef8d22bd9 28-Sep-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug 3004701 do not prefetch during Realize.

Removed unused Android object states in enum, not used in
play state machine.
Made SfPlayer responsible for the creation of its
AudioTrack once it knows the sample rate and number of
channels of the content to play once it's done
preparing.
Added notification from SfPlayer to signal when it's
done preparing. This informs of the audio characteristics
and kicks off the content prefetching.
In the AudioPlayer realize:
- do not start the prefetching, do it when the player
is set to PAUSED
- don not create the AudioTrack, do it when SfPlayer
is done preparing.

Change-Id: Ic345040e71cef0e5953ea47366930d1dfbc5e761
ndroid.mk
d94d32190f845b41f212c9c1918758e33fef6382 26-Sep-2010 Jean-Michel Trivi <jmtrivi@google.com> Support content looping for URI and FD data sources.

Implement SetLoop() on AudioPlayer with URI and FD
data sources. Only looping over the whole duration
of the audio content is supported here.

Change-Id: Ic033f61063e57c3a9f8c51bad15852a42b21ab46
ndroid.mk
lesTestLoopUri.cpp
ff037a1f697a15fb4249e62fe783f22398572cbe 21-Sep-2010 Jean-Michel Trivi <jmtrivi@google.com> Implement buffer cache fill level and status notification.

OpenSL ES requires the notification of buffering status
changes and caching fill level updates. Fill level
updates happen only when the level has changed by
a certain amount.

Change-Id: I8b5e82ac1dfff35d7a27eda0dd1f395311d554f3
lesTestPlayUri.cpp
01e9f5fa4698856f92bcfd88188ee4c8397b22db 22-Sep-2010 Glenn Kasten <gkasten@google.com> Android simple buffer queue locator and interface

Bug fixes:
Fix bug in error handling and recovery for checkDataSource - potential memory leak.
Clean up MPH table; there were some missing and uncommented entries.

Testing:
Add comments about using the END macro to test the MPH table.
Convert feedback test from buffer queue to Android simplified
buffer queue for rx side only, tx is still 1.0.1 buffer queue.
Add option to sample/intbufq test to use build option to decide
whether to use 1.0.1 buffer queue or Andorid simple buffer queue.
Convert record test for new APIs.

Miscellaneous:
Update hashgen table and add an install rule.
Add comments.
Add more logging.
Line length 100.
Fix build warning.
Double indent.
Fix SL_DATALOCATOR value for FD.

Change-Id: I35cce8934157fed88251e846b1beb15523b2b1a6
lesTestPlayStreamType.cpp
lesTestPlayUri.cpp
453dd564a81fe98b7a947ae4a9844a53fa957c2b 18-Sep-2010 Jean-Michel Trivi <jmtrivi@google.com> Remove the SLAndroidStreamTypeItf interface.

It is now replaced by SLAndroidConfigurationItf which implements
the same functionality (and more).

Modified test to demo setting AudioPlayer stream type to use
SLAndroidConfigurationItf

Modified SLAndroidConfigurationItf to enable passing a
NULL pointer to value so the value size for the key ca
be queried.

Fixed type in AudioPlayer and AudioRecorder Android side
which reported an error if the SetConfig() function was
called when the object was unrealized (the intent is
to check that the object is NOT realized because we
are configuring the resources the object is going to use).

Change-Id: I20f3dba8c63066db94d537109854b4c4139f65b3
ndroid.mk
lesTestPlayStreamType.cpp
43e7743b5297cc5afcb246a7e2b5d825a607f8af 15-Sep-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix bug where OutputMix is not fully initialized by CreateOutputMix()

In the implementation of SLEngineItf, CreateOutputMix() didn't call
android_outputMix_create() which initializes the mEffects pointers.
Added checks on SfPlayer in case an application start calling
interface functions when Realize() on an AudioPlayer isn't done.

Change-Id: Id3fb9f02b5c29a1d87255e7935542ebcf4b8dd46
lesTestPlayUri.cpp
91bfd060b992810ca092f640f77f795bc3d008be 01-Sep-2010 Glenn Kasten <gkasten@google.com> Improve test app portability for other platforms

Change-Id: I8793b7e6f6ebd0f83ff8e5bd534234cd1f4166a2
lesTestPlayStreamType.cpp
fe96fa06360516c60490c7a697e1148017b4c1b2 23-Aug-2010 Glenn Kasten <gkasten@google.com> Fix bug with nested lock.

Add object lock debugging.
Replace !NDEBUG by USE_DEBUG.
Remove $(JNI_H_INCLUDE) and $(TOP).

Change-Id: I61217b82a7edc42d37dacf443ad0ca852ee0dfe9
ndroid.mk
4c71179974933c5c36cbfc3e8227c8df63248d91 21-Aug-2010 Glenn Kasten <gkasten@google.com> Test reorganization

Change-Id: I0fb84afd72fe6839773937fdaece3276bba1b952
ndroid.mk
ultiplay.c
eekTorture.c
lesTest_playMuteSolo.cpp
a05622c974763d8ca038f3d39743c926309ab2c2 16-Aug-2010 Jean-Michel Trivi <jmtrivi@google.com> Support SLPrefetchStatusItf on an AudioPlayer pulling from a BufferQueue
- Make SLPrefetchStatusItf explicit on Android as per spec.
- Signal prefetch status underflow when queue becomes empty, and
sufficient data when filled again.

Change-Id: I0e0ae9dc305fe6d83dd4497741f9271ca465edd5
eekTorture.c
095ce2204cc75a50d9f1df60d1c8f357209a7c3d 10-Aug-2010 Glenn Kasten <gkasten@google.com> Permute is a tool used by seek torture test.

Change-Id: Ifd077cda90f89c11011c8dd606a766d8b0ed5797
eekTorture.c
b78fe5f783209fbe1fed42634ca9889052ffcd0b 10-Aug-2010 Jean-Michel Trivi <jmtrivi@google.com> Do not initialize effect descriptors if the audio player couldn't
be initialized.

Test playback behavior after stop.

Change-Id: I67d78b73f5392948e00af99eaa9335f76256df14
lesTest_playStates.cpp
b9fa556e62aa6e0c8a59f224136e509df813cfc7 04-Aug-2010 Glenn Kasten <gkasten@google.com> Add the seek torture test

Change-Id: Icd4ef20283f6f0ac499901a7ffa8e9416abb2798
ndroid.mk
eekTorture.c
ee21d26b4b66d0f19b826685b3070497523994d5 28-Jul-2010 Glenn Kasten <gkasten@google.com> Khronos recommendation: include "SLES/OpenSLES.h"

Change-Id: Iaa36d08f313a29ad2914e7459448bf9418e8c6c8
ultiplay.c
lesTestPlayStreamType.cpp
lesTestPlayUri.cpp
lesTestPlayUri2.cpp
lesTest_playMuteSolo.cpp
lesTest_playStates.cpp
a64474bb5e142123ae3630bcd403dfb62bd64fc8 26-Jul-2010 Glenn Kasten <gkasten@google.com> Flatten the tests/mimeUri directory.

Change-Id: Ib8056ec7a4a167e6afdce7f020468381126c657e
ndroid.mk
ultiplay.c
ultiplay/Android.mk
ultiplay/multiplay.c
layMuteSolo/Android.mk
layMuteSolo/slesTest_playMuteSolo.cpp
layStates/Android.mk
layStates/slesTest_playStates.cpp
layStreamType/Android.mk
layStreamType/slesTestPlayStreamType.cpp
layUri/Android.mk
layUri/slesTestPlayUri.cpp
layUri2/Android.mk
layUri2/slesTestPlayUri.cpp
lesTestPlayStreamType.cpp
lesTestPlayUri.cpp
lesTestPlayUri2.cpp
lesTest_playMuteSolo.cpp
lesTest_playStates.cpp
4b65ef9efdf5aba01bea89d8cdd64f500560a28d 17-Jul-2010 Glenn Kasten <gkasten@google.com> Buffer queue and audio player maintenance.

Known problems on Android only (SDL is ok):
High latency on first enqueue, or first after buffer underrun
Play after stop does not resume the current buffer.

Improvements:
Implement BufferQueue::Clear for both Android and SDL.
Play::SetPlayState to Stopped now works for SDL (not yet for Android), and
sets play cursor to start of current buffer.
Play::Pause and Play::Stop while playing now block until done for SDL.
SDL now calls buffer queue callback after each buffer completion, instead of when mixer needs a buffer.
Move SF_INFO sfinfo to CAudioPlayer so we always have good stuff like the sample rate etc.
BufferQueue::Enqueue on a successful enqueue to a formerly empty queue
now kicks off an attribute change followed by a synchronous call to a
hook when first buffer enqueued. Currently unused but could be a way to reduce latency.
Minor comment changes.
Add interface_cond_broadcast.
More logging of errors.
Include source file and line number in logs.
sles_to_android.cpp: needs code for #if 0 sections.
Disable trace logging of BufferQueue::Enqueue and GetState.
Fix printf warnings.
Fix typo in number of interfaces requested at CreateAudioPlayer.
Remove spurious printf and while loop.
Line length 100.
Add intermediate play states which need to be re-mapped.
Fix printf format warnings.
Re-organize the buffer queue initialization.
Implement true seeking based on position for libsndfile.
SndFile is working again, but just barely.
Make it build on non-Android platforms.
BufferQueue::RegisterCallback now checks for STOPPED play state.
Include function name in trace logs.
Enhance test to check buffer queue callbacks, get buffer queue state, get play state.
Fix bug with Stop while Paused not resetting buffer pointer.
Remove obsolete comments and #if 0.
Set enqueue attribute is state is PLAYING and the first buffer is enqueued.
Added slutPrintIIDs.
Update comments.
Fix build warnings.
Fix compile error introduced by the merge.
Fix runtime problems introduced during the merge.
Address code review comments:
- BufferQueue changes apply to AudioRecord also.
- Rename to conform to new naming conventions.
- Add comments.
Fix build warning.
Add interactive buffer queue test application.

Change-Id: I5b00545a599fd9dba96efb834fca2369d149eaaa
ultiplay/multiplay.c
layMuteSolo/slesTest_playMuteSolo.cpp
layUri2/slesTestPlayUri.cpp
8eabaa529bf4796543a54bccc6f87def95e0b326 09-Jul-2010 Glenn Kasten <gkasten@google.com> Port test apps to non-Android platform.

Change-Id: If4e8ace08b3eee8c62c375a5b238fd1ed3665a06
layMuteSolo/slesTest_playMuteSolo.cpp
layUri/slesTestPlayUri.cpp
layUri2/slesTestPlayUri.cpp
603d9aec6b2d96693bf91cba4b0a678027c34572 09-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> Since SLPrefetchStatusItf is explicit, fix the playUri test to
request two interfaces (volume and prefetch) when creating the
AudioPlayer.

Change-Id: I97b18b68dac2ffacef9c709c3f1c2ee85081e07d
layUri/slesTestPlayUri.cpp
ed46c29d6a09112dbbf584c82953f63289596fd6 03-Jul-2010 Glenn Kasten <gkasten@google.com> Trace debug support.

Add Enter/Leave interface macros for trace debugging.
3D interface methods do not block for now.
Line length 100.
Add blank lines between interface methods for clarity.

Change-Id: I412936e8574f95308731e41f8b854fe342cb04b6
ultiplay/multiplay.c
1c1c2d6d225e8180ba85f41170f7921d471308da 01-Jul-2010 Jean-Michel Trivi <jmtrivi@google.com> Let SfPlayer handle the play state with regards to decoding.
This fixes the bug where the player couldn't be resumed after being paused.
Add test of the OpenSL ES play states.

Change-Id: I3793941abf852aaca359346c656e4a8e29ed666c
layStates/Android.mk
layStates/slesTest_playStates.cpp
1c1c16f5469b9ebb4943e2c5eb648f832e0a3c37 30-Jun-2010 Glenn Kasten <gkasten@google.com> Initial draft of multiplay command-line test app.

Change-Id: I821573c7e9eef123dab3a5b00e1040ab69ea215a
ultiplay/Android.mk
ultiplay/multiplay.c
b98e6b7b1cc2a130a29904e52ae7a71e15332a49 29-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Add a test for GetStreamType on SLAndroidStreamTypeItf.

Change-Id: I2115488a2d4dc97a8bb1f5f01742e77d0960e394
layStreamType/slesTestPlayStreamType.cpp
05ccff2aaa3e1507cdc7ab3b244c973c6708e009 29-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Declaration and implementation of a new OpenSL ES interface to set
to set the Android stream type on an AudioPlayer object.

Change-Id: Ic5d14e9899dfbccfc647642ae562730807bc73fe
layStreamType/Android.mk
layStreamType/slesTestPlayStreamType.cpp
e5bf0d2c9531a7064eb3ddcafaf93ac1b0974037 24-Jun-2010 Glenn Kasten <gkasten@google.com> Gain and transport attributes at mutex unlock.

Update both interface and player copies of mute/solo.
Move synchronous gain and transport updates to mutex unlock exclusive.
Update sync thread logic.
Keep track of player position using tracks in PCM frame units.
Implement solo.
Various volume-related fixes.
Mute solo fields are only in IMuteSolo, but IMuteSolo is
immediately after IVolume to make it easier to find.
Move Android volume fields into audio player.
Fix printf missing newline.
Only one copy of mute and solo.
Clean up comments.
Line length 100.
SDL gain and transport updates are synchronous.
Fix unused variable warnings.
Use symbol for number of stereo channels.
Rearrange fields to save memory.
Add comments.
Fix problems introduced during the last merge.

Change-Id: I121fcbe4189b06850983941f540942a745fc51fb
layMuteSolo/slesTest_playMuteSolo.cpp
fa8629b180d59a299675cda6c95c4fc2b74645e3 29-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Fix test makefiles for OpenSL ES test apps.

Change-Id: I996bd47aad50231f8d93f48fdedac3be74295592
layMuteSolo/Android.mk
layUri/Android.mk
layUri2/Android.mk
85bae78453492b42c7095cafc404a049e52bbc22 25-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> New test / demo to exercise SLMuteSoloItf on an AudioPlayer.

Change-Id: Ib3fddaea46098ed944b62d08d8ba8a657bf0174c
layMuteSolo/Android.mk
layMuteSolo/slesTest_playMuteSolo.cpp
de16b4c2bc71c163c7c821a475a53a3b567789b2 16-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Introduction of Stagefright to replace MediaPlayer.
Change-Id: I59c467ebafed6f5ceee37c2d8f6cd132b25c1459
layUri/slesTestPlayUri.cpp
2a00e1105c1e051f13d2b5f3f69f02882de982ea 11-Jun-2010 Glenn Kasten <gkasten@google.com> Fix printf format bug.

Change-Id: Ic81eea513315ca6465a6cbc5d19731122bbb62ed
layUri2/slesTestPlayUri.cpp
85da61df4231113debc9e829c9b71493ab945200 10-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> The library for the OpenSL ES implementation is supposed to be name
libOpenSLES, not libopensles.

Change-Id: Icdfb266650abb75a8aaf5670b651bfea1361c3c1
layUri/Android.mk
layUri2/Android.mk
b0dc406de15e71fb53df0bd070b611317bea1d73 09-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> New OpenSL ES test+demo application that uses the SLPrefetchStatusItf.
Plays two URIs and pans them left and right.

Change-Id: Ic804c0d666889088db6a4075f5c40029e11273fe
layUri2/Android.mk
layUri2/slesTestPlayUri.cpp
8addfbc02746de2e4d3f87ce50e4ba2e547e7485 09-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "OpenSL ES tests shouldn't be built in all builds." into kraken
c0bee8e867b37db601809df7a6fc30f8ee698e83 08-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> OpenSL ES tests shouldn't be built in all builds.

Change-Id: Ib014c47cb5c25d1348e544ead3e272e4d2194d5f
layUri/Android.mk
06a1b91fb42d3ecc9da725e673b56ca849b9b9a4 04-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Modify implementation of SLPlayItf to only start prefetching data
when the playstate is set to PAUSED, and notify prefetch status
change and buffer fill level through the SLPrefetchItf callback.
Modify test app to correctly start playing only after a prefetch
status change.

Change-Id: I51482bb5b7db419bdb694be2277282d94ff8234f
layUri/slesTestPlayUri.cpp
f8acf4b469cdc9d2fe08fb7f6ca007365efc8bc1 02-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> For audio players with URI data source:
- Modify stereo volume update to also work on a MediaPlayer.
- Add support for completion callback when play event mask
specifies SL_PLAYEVENT_HEADATEND
Before changing a property related to the SLVolumeItf or
SLPlayItf, check that the property has changed before applying
it to avoid useless calls and computations.
Cleanup in playUri test and compile without warnings.
Remove "driver" test content: test app was previously moved
to tests/pcmBufferQueue.
According to spec: initialize periodic update for SLPlayItf
and SLRecordItf to 1s.
Change-Id: I00dad162eac7c0d88b535ab65e2351353b8888d5
layUri/slesTestPlayUri.cpp
dc181a4a041fe4be7c91b92646b236b6d652f4a3 02-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Implement GetDuration and GetPosition in SLPlayItf

Change-Id: I83ae15310c3e473556703e5d373aef5a07e6eda5
layUri/slesTestPlayUri.cpp
daf661248ff6ea2e21799e5114c78b7c1d49630e 29-May-2010 Glenn Kasten <gkasten@google.com> Move platform-specific code to separate files. Use sles_allinclusive.h to really mean all inclusive. MuteSolo check channel count.

Change-Id: I96caab5be55a1f04342eb67b511309babd5a6916

Make a copy of data source and sink parameter to avoid dangling inputs. Pre-process URI scheme and MIME type using a perfect hash. Line length 100.

Change-Id: Icb1e1a7a9c6370eda1e15e61f0dff35c1d59d7fa

Fix merge problem on Android.

Change-Id: I70b724273147f3981550272990729a4a409e1f72

MIME type needs to be completely initialized.

Change-Id: I3766acfb170abc976506cf305fabd5548107f592

Remove MIME lookup and URI scheme lookup.

Change-Id: I7058dfef01c9db509ad5915d9f8099a720e6736b
layUri/slesTestPlayUri.cpp
1be90f9197d7a48e788b5e40fd15d73a877acef0 01-Jun-2010 Jean-Michel Trivi <jmtrivi@google.com> Add command line test to play a URI, to exercise the OpenSL ES
AudioPlayer with a SL_DATALOCATOR_URI as data source. Plays 10s
of the URI.

Change-Id: I24b8ae5293c4efbc372551febd91eb6dafe890eb
layUri/Android.mk
layUri/slesTestPlayUri.cpp