OSDN Git Service
Glenn Kasten [Wed, 5 Jan 2011 16:03:38 +0000 (08:03 -0800)]
OpenSLESUT.h is not (yet) a supported header
so remove the symlink from the SLES/ directory
Change-Id: I95e331ac3b94457fe4c1c063069995bc48a659b4
Glenn Kasten [Wed, 5 Jan 2011 21:58:31 +0000 (13:58 -0800)]
Don't overwrite previous error in locator check
Change-Id: Ib7c2f1f34691160d881d4a2293b691e52ff01aa4
Glenn Kasten [Thu, 6 Jan 2011 17:33:33 +0000 (09:33 -0800)]
Merge "Comment out and decrease log level for play state"
Glenn Kasten [Thu, 6 Jan 2011 17:33:25 +0000 (09:33 -0800)]
Merge "Bug
3326605: AudioRecorder uses wrong channel mask"
Glenn Kasten [Thu, 6 Jan 2011 17:33:08 +0000 (09:33 -0800)]
Merge "Include data source or sink name in log messages"
Glenn Kasten [Thu, 6 Jan 2011 17:33:02 +0000 (09:33 -0800)]
Merge "Fix bug in seek torture test"
Glenn Kasten [Thu, 6 Jan 2011 17:32:52 +0000 (09:32 -0800)]
Merge "Improve error handling and help message in test"
Glenn Kasten [Thu, 6 Jan 2011 01:16:13 +0000 (17:16 -0800)]
Bug
3326605: AudioRecorder uses wrong channel mask
Change-Id: I466979669e831334b390d0ff381420cf1fe61b98
Glenn Kasten [Wed, 5 Jan 2011 23:42:17 +0000 (15:42 -0800)]
Include data source or sink name in log messages
Change-Id: I56ee300bd040581ad1c7e2be7897604730d743d6
Glenn Kasten [Wed, 5 Jan 2011 23:05:01 +0000 (15:05 -0800)]
Improve error handling and help message in test
Change-Id: I0133b3ec0fe061d4be539ce998b81c13f1019593
Glenn Kasten [Wed, 5 Jan 2011 23:05:50 +0000 (15:05 -0800)]
Comment out and decrease log level for play state
Change-Id: I1844b52b2576b1113a6f1d9698020ccd11666c02
Glenn Kasten [Wed, 5 Jan 2011 22:07:42 +0000 (14:07 -0800)]
Fix bug in seek torture test
This was found because we now do better checking of data locators.
Change-Id: Iaa18426234f034129822c06b2ece4b45764f72f3
Glenn Kasten [Wed, 5 Jan 2011 21:56:46 +0000 (13:56 -0800)]
Android SDK level report is the highest available
Change-Id: I9d868d94261ee9aaf51b851bc95e99c79b84087b
Glenn Kasten [Wed, 5 Jan 2011 15:58:02 +0000 (07:58 -0800)]
Merge "Remove obsolete USE_BACKPORT"
Glenn Kasten [Wed, 5 Jan 2011 15:57:55 +0000 (07:57 -0800)]
Merge "Move a few FIXME to a separate to-do list"
Glenn Kasten [Wed, 5 Jan 2011 15:57:43 +0000 (07:57 -0800)]
Merge "Remove obsolete EQ test code"
Glenn Kasten [Tue, 4 Jan 2011 21:01:33 +0000 (13:01 -0800)]
Move a few FIXME to a separate to-do list
And delete a few FIXME that are obsolete.
Change-Id: Ibc65c26e75f9e9ace81d264760f93384a7fc71a5
Glenn Kasten [Tue, 4 Jan 2011 21:00:24 +0000 (13:00 -0800)]
Remove obsolete EQ test code
Change-Id: Iae86d766b382f96d87c2b41f3a6e6f988f54d791
Glenn Kasten [Tue, 4 Jan 2011 20:42:06 +0000 (12:42 -0800)]
Remove obsolete USE_BACKPORT
Change-Id: I4e13d4f5c57fa7b676737be89a6b0a9bec6aa65f
Note: the ANDROID rename will be a separate changelist.
Jean-Michel Trivi [Tue, 4 Jan 2011 20:14:35 +0000 (12:14 -0800)]
Fix SLAndroidBufferQueueItf callback registration for a MediaPlayer
Add missing break when testing if object is a MediaPlayer.
Change-Id: Ib2796ff65b7434902c5e7910577603f6bd1e817e
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:01:31 +0000 (16:01 -0800)]
am
9468a111: Merge "IAndroidEffect.c is actually a c++ file."
* commit '
9468a1116bba91c4fabe06a97c266d8332b030aa':
IAndroidEffect.c is actually a c++ file.
Jean-Baptiste Queru [Wed, 29 Dec 2010 21:00:18 +0000 (13:00 -0800)]
Merge "IAndroidEffect.c is actually a c++ file."
Bruce Beare [Sun, 26 Dec 2010 17:55:13 +0000 (09:55 -0800)]
IAndroidEffect.c is actually a c++ file.
The file uses new and delete; It requires -fno-rtti
to correctly build for Android. Since -fno-rtti is only
available (with the 4.2.1 IA toolchain) for g++, we
rename the file.
Change-Id: Ib8cb75c64aeae207f80429795bff663f3e8aee39
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Michel Trivi [Thu, 16 Dec 2010 19:57:17 +0000 (11:57 -0800)]
Don't trace all OpenSL ES methods in the log
Change-Id: I3039807ef1d056efcd2ab91198f1c9ba706b78eb
Glenn Kasten [Thu, 16 Dec 2010 20:10:12 +0000 (12:10 -0800)]
Clean up the API macros
SL_API and XA_API declare a symbol to be exported by .so.
SLAPIENTRY and XAAPIENTRY are for calling conventions, and are currently unused.
Also unified the 64-bit int types between SL and XA.
Remove obsolete symlinks.
Change-Id: I248f624f3e974f130c62cfc27ce9ad8eb40c0b56
Glenn Kasten [Thu, 16 Dec 2010 18:43:10 +0000 (10:43 -0800)]
Merge "Test bug fixes"
Glenn Kasten [Thu, 16 Dec 2010 18:43:01 +0000 (10:43 -0800)]
Merge "Delete blank line at EOF"
Glenn Kasten [Thu, 16 Dec 2010 18:42:55 +0000 (10:42 -0800)]
Merge "Fix portability problem for desktop test build"
Glenn Kasten [Thu, 16 Dec 2010 16:42:47 +0000 (08:42 -0800)]
Fix bad pointer caught by clang static analysis
Change-Id: I6f22f04a93b70a513ac88b1174bc282009969a6a
Glenn Kasten [Thu, 16 Dec 2010 16:37:35 +0000 (08:37 -0800)]
Fix portability problem for desktop test build
Change-Id: I7bf344f5f7da2b6ce8bdfa7487da7594719fcd4d
Glenn Kasten [Mon, 13 Dec 2010 18:38:09 +0000 (10:38 -0800)]
Delete blank line at EOF
Change-Id: I0786ba4dd49f0e9c289ce96f9208c6f1cd63fb9e
Jean-Michel Trivi [Wed, 15 Dec 2010 22:11:53 +0000 (14:11 -0800)]
Use NDK API to initialize display surface in OpenMAX AL TS demo.
Use ANativeWindow functions defined in android/native_window_jni.h
to initialize the display surface to be used as video sink by the
OpenMAX AL MediaPlayer.
Change-Id: I36a91f4d9a928efa861ae0c01ea5856d4e36b46f
Jean-Michel Trivi [Tue, 14 Dec 2010 22:28:30 +0000 (14:28 -0800)]
Merge "OpenMAX AL: set video display surface from video sink"
Jean-Michel Trivi [Tue, 14 Dec 2010 20:23:00 +0000 (12:23 -0800)]
OpenMAX AL: set video display surface from video sink
Initialize the media player's video surface with the surface pointer
obtained from the Java Surface.
Added notes on parts of the interface that will change, and are
currently in place for the sample code to run, before the
upcoming video initialization changes.
Change-Id: Id606f4bca68d227fa9df863922b880e865f845d5
Ying Wang [Tue, 14 Dec 2010 19:07:52 +0000 (11:07 -0800)]
The correct tag is "tests", not "test"
Change-Id: Ib28337b6f2bf2598175dc697950c46a9c7e98b1b
Jean-Michel Trivi [Tue, 14 Dec 2010 04:54:24 +0000 (20:54 -0800)]
Transport stream: handle internal async preparation and play state.
In OpenMAX AL and OpenSL ES, update the Android object state
according to the prepare state (transitions from unitialized to
preparing to ready after a prepare), and correctly use it to
handle play state changes.
Change-Id: Id58fb6d2fdce1a5ccd7ddae135b9969e93cb1ba3
Glenn Kasten [Tue, 16 Nov 2010 01:50:51 +0000 (17:50 -0800)]
Test bug fixes
Preset reverb durationInMsec changed from 5000 to 10000.
NDK does not have an independent API level, so use the SDK's API level.
Removed a workaround for a bug which is now fixed in the implementation.
Fix uninitialized variable in test.
Change-Id: Ibaa4f1d2351e8f75290377cadc02ee2709bf720b
Jean-Michel Trivi [Sun, 12 Dec 2010 02:10:12 +0000 (18:10 -0800)]
Continue unifying OpenSL ES / OpenMAX AL implementation
Add new header for Android definitions.
Rename the Android object types to be more descriptive (data source,
player).
New Android and volume fields to CMediaPlayer object, initialize
those fields.
Unify play state control between CMediaPlayer and CAudioPlayer.
Change-Id: I23e9c03a88cc29c5a40525edf5693a9d05285e6b
Jean-Michel Trivi [Fri, 10 Dec 2010 19:03:19 +0000 (11:03 -0800)]
Start support for XAAndroidBufferQueueItf in OpenMAX AL
Added an Android OpenMAX AL header for the Android interfaces
Registered the AndroidBufferQueueItf as an explicit
interface on MediaPlayer.
Updated the Java+Native example to register a callback from
which OpenMAX AL can retrieve the data to play
Started unifying the player object used by OpenMAX AL and
OpenSL ES so they use a common class.
Change-Id: I73cec8c802f74767545c91278e5e73c8c7995218
Jean-Michel Trivi [Wed, 8 Dec 2010 23:20:20 +0000 (15:20 -0800)]
Add superclass for audio-video playback
Change-Id: Ie7f5cb9d789d41c605dc318bbb311aadabce2c96
Jean-Michel Trivi [Wed, 8 Dec 2010 23:42:17 +0000 (15:42 -0800)]
Merge "Correct data locator and format check for AndroidBufferQueue source."
Jean-Michel Trivi [Wed, 8 Dec 2010 23:15:53 +0000 (15:15 -0800)]
Correct data locator and format check for AndroidBufferQueue source.
Change-Id: Ib70391148e2abded57ec0f6028e081f5232ffc31
Glenn Kasten [Tue, 7 Dec 2010 19:38:40 +0000 (11:38 -0800)]
Native media test app
Change-Id: I2089733b4b4adc1d9da75a9c93c72b7c353c668f
Jean-Michel Trivi [Wed, 8 Dec 2010 01:44:35 +0000 (17:44 -0800)]
Update use of IStreamListener interface to latest proto
Change-Id: I4dc35a0637094780ffb1b7e4006a60fc256770a9
Glenn Kasten [Fri, 3 Dec 2010 17:03:51 +0000 (09:03 -0800)]
Continue implementation of MediaPlayer object
Add CMediaPlayer.c for the various hooks.
Start implementing Play::SetPlayState for MediaPlayer.
CheckDataSource and Sink now takes a mask of allowed data locator types.
Data source and sink error logs now include the name of the source or sink.
Change-Id: I3702c977dd367a788ce78575e1e2891dafd2c983
Andreas Huber [Tue, 7 Dec 2010 18:04:38 +0000 (10:04 -0800)]
Support for streaming.
Change-Id: I8c4b53b57ceccf076c971d2ac8cd1223ecece094
Jean-Michel Trivi [Thu, 2 Dec 2010 18:52:28 +0000 (10:52 -0800)]
Fix build: bad member variable rename
Change-Id: Ic6092ce27cf3f82d26398ec2f7fb89c9aa6b4828
Jean-Michel Trivi [Thu, 2 Dec 2010 18:26:21 +0000 (10:26 -0800)]
StreamPlayer::onPrepare() should synchronously prepare its player
Change-Id: If8ec63e8b93dea2e1810046e05e692755e6a8887
StreamPlayer::onPrepare() should only return when its media player
is done preparing, so other player commands are processed from
the message queue when the player is ready to receive them.
Jean-Michel Trivi [Thu, 2 Dec 2010 00:53:06 +0000 (16:53 -0800)]
Asynchronous prepare() on StreamPlayer
Prepare the StreamPlayer object asynchronously.
Fixes the deadlock issue between the SLAndroidBufferQueue callback
registration and Enqueue() functions.
Change-Id: I76963233f658946db87d0aab6f225bc9e7c8210a
Jean-Michel Trivi [Wed, 1 Dec 2010 00:09:02 +0000 (16:09 -0800)]
More support for SLAndroidBufferQueueItf
Implement Enqueue()
Store "caller" interface to use in the AndroidBufferQueue
callback.
Update test app in sandbox to use the callback to read
from a file and enqueue buffers directly.
Change-Id: I68413731d311532b08f8f13577e3ca81c033fcd4
Glenn Kasten [Wed, 1 Dec 2010 05:05:47 +0000 (21:05 -0800)]
Start implementing CreateMediaPlayer
Add CMediaPlayer class.
Add IEngine_CreateMediaPlayer handler.
Add OpenMAX AL native display data locator and raw image data format.
Add OpenMAX AL I/O devices: camera and radio.
Change-Id: Ie99c09110ac9fdcd98bf0bfc487c6e3fcde58f19
Glenn Kasten [Tue, 30 Nov 2010 20:23:13 +0000 (12:23 -0800)]
Start splitting up sles_allinclusive.h.
This is the low-hanging fruit only.
Will do the harder parts later.
Change-Id: Ib85ffae7891e1f980dc1f7807df00c1d59df58a5
Jean-Michel Trivi [Mon, 29 Nov 2010 23:35:13 +0000 (15:35 -0800)]
Support for the SLAndroidBufferQueueItf interface
Rename AndroidStreamSource to AndroidBufferQueue.
Add prototype for SLAndroidBufferQueue functions.
Update sandbox test app to use the new interface.
Change-Id: Ib82180c22e5cf0dd982b4a9bb132667cd2ac4dd7
Glenn Kasten [Mon, 29 Nov 2010 00:33:53 +0000 (16:33 -0800)]
Continued work on OpenMAX AL engine APIs
Added xaCreateEngine as synonym for slCreateEngine,
but not yet reference counted to share same object with slCreateEngine.
Added the beginnings of a XA_IID_ENGINE engine interface
but still needs more work.
Added simple xa test app.
New extension: ANDROID_SDK_LEVEL_10 (not NDK per digit).
Split up sles.c:
- Move data source, sink, locator, format code to data.c
- Move global entry points to entry.c
- Collect all engine-related code into CEngine.c
- Collect all device-related code into devices.c
Change-Id: I9fdeed1e29f698869f409014a39401999ac84e5f
Jean-Michel Trivi [Tue, 23 Nov 2010 19:45:12 +0000 (11:45 -0800)]
Control MediaPlayer instance from SL ES interfaces
Implement transport control on StreamPlayer.
Store the StreamPlayer in CAudioPlayer as an sp<>
In StreamPlayer: create a media player from the
mediaplayerservice, and implement the IStreamSource
interface to get data fromt the application
callback.
Note that the SLDataLocator_AndroidStreamer and
SLAndroidStreamSourceItf are very much in flux
at the moment.
Change-Id: I11035aafcefd59aad99d1fec9fd54a622e6d1e0f
Glenn Kasten [Mon, 8 Nov 2010 19:56:45 +0000 (11:56 -0800)]
Prepare for merged OpenMAX AL and OpenSL ES engine
Field mEngine is now a reference to CEngine instead of IEngine.
Restore Android.mk.
Move mThreadPool, mEqPresetNames, mEqNumPresets from IEngine to CEngine.
IEngineCapabilities_QueryLEDCapabilities and
IEngineCapabilities_QueryVibraCapabilities are now non-static
so that they can be shared by OpenMAX AL's IEngine.
IEngineCapabilities is now required in the build, used by OpenMAX AL IEngine.
The default MPH tables now depend on USE_DESIGNATED_INITIALIZER,
and generate tables for other C compilers programmatically.
Updated comments in MPH.h.
Removed conditionals from MPH_to.c so that non-GNU tables can be built more easily.
Make the interface ID hash generator less specific about hashing algorithm.
Re-build interface ID hash tables.
Update IID_to_MPH.c based on hashgen.
Add generated MPH_to_*.h.
Remove Android dependency.
Change-Id: Icdf89eedc825f9e52bc264b22d923ae157244ed3
Jean-Michel Trivi [Sat, 20 Nov 2010 00:27:10 +0000 (16:27 -0800)]
Set the MediaPlayer data source from a SL_DATALOCATOR_ANDROIDSTREAMER
Use the data locator information to initialize the data source
of the MediaPlayer instance used in the StreamPlayer object.
Register the callback only when the player is stopped.
Added callback events that can be passed from the application
to the implementation to synchronously signal events.
Change-Id: I1fc52d8d46b2bcf8ca11ab0e4d44d40e704ddbfc
Jean-Michel Trivi [Fri, 19 Nov 2010 17:37:31 +0000 (09:37 -0800)]
Merge "Maintain a MediaPlayer instance inside StreamPlayer"
James Dong [Fri, 19 Nov 2010 02:19:32 +0000 (18:19 -0800)]
Merge "Support 64-bit file size/offset"
Jean-Michel Trivi [Fri, 19 Nov 2010 02:15:30 +0000 (18:15 -0800)]
Maintain a MediaPlayer instance inside StreamPlayer
StreamPlayer is the object that abstracts for OpenSL ES the
playback of elementary streams. It encapsulates a MediaPlayer
instance which will handle the playback. This CL simply
creates and deletes a MediaPlayer instance during the life-cycle
of StreamPlayer.
Change-Id: I5d56dca72fa05496fcbd0b60a064a6b955494387
Jean-Michel Trivi [Fri, 19 Nov 2010 01:26:01 +0000 (17:26 -0800)]
More support for SL_DATALOCATOR_ANDROIDSTREAM
- add test app in sandbox: based on playUri with different data
locator
- new object, StreamPlayer, that will encapsulate the life-cycle
of the new MediaPlayer object that implements the streaming.
Change-Id: Idfdb00e8622ff18d131465d11178979232ee04f8
James Dong [Wed, 17 Nov 2010 00:46:03 +0000 (16:46 -0800)]
Support 64-bit file size/offset
o This patch depends on the patch in the media framework to support 64-bit file size/offset
Change-Id: Ie26b4ac70eb45654ee9ccc3961b4cc5690468c14
Jean-Michel Trivi [Sat, 13 Nov 2010 00:47:50 +0000 (16:47 -0800)]
Definition of a new data locator and interface for streaming.
Change-Id: Ib929749beca048be46187cabbf466981d81143e7
Jean-Michel Trivi [Thu, 11 Nov 2010 18:39:29 +0000 (10:39 -0800)]
Bug
3183484 OpenSL ES: add support for the AUDIO_SOURCE_VOICE_COMMUNICATION record source.
Change-Id: Icc593bdf2cc6ef7f61537661a82f63a46dc8693f
Glenn Kasten [Sat, 23 Oct 2010 01:54:09 +0000 (18:54 -0700)]
am
e3d47748: Merge "Fix bug
3112893 in handling of container size" into gingerbread
Merge commit '
e3d47748d093dde0290863bffa4db2f59d5245d8'
* commit '
e3d47748d093dde0290863bffa4db2f59d5245d8':
Fix bug
3112893 in handling of container size
Glenn Kasten [Sat, 23 Oct 2010 01:54:07 +0000 (18:54 -0700)]
am
202d57f8: Merge "Bug
3101247 - move track ownership" into gingerbread
Merge commit '
202d57f8783ee65d20f6d38b870205fd4cad9e66'
* commit '
202d57f8783ee65d20f6d38b870205fd4cad9e66':
Bug
3101247 - move track ownership
Glenn Kasten [Sat, 23 Oct 2010 01:54:03 +0000 (18:54 -0700)]
Glenn Kasten [Sat, 23 Oct 2010 00:17:58 +0000 (17:17 -0700)]
Merge "Fix bug
3112893 in handling of container size" into gingerbread
Glenn Kasten [Sat, 23 Oct 2010 00:17:36 +0000 (17:17 -0700)]
Merge "Bug
3101247 - move track ownership" into gingerbread
Glenn Kasten [Fri, 22 Oct 2010 18:03:10 +0000 (11:03 -0700)]
Bug
3101247 - move track ownership
Preliminary fix for torture test failure - move track ownership
Change-Id: I4c9de6a85cc0bd594f16bdb1a5de61f5f268cfdb
Glenn Kasten [Mon, 18 Oct 2010 17:56:43 +0000 (10:56 -0700)]
Bug
3102561 - Tests only
Make the multi-thread test more stressful, to crash more often.
New tests: playbq, srcsink, monkey.
In monkey, re-enable destroy at difficult times.
Add support for testing player insert reverb to the reverb test.
Note: building playbq is disabled by default because it needs libsndfile.
Change-Id: I592ea5f567bddc61174e7d41bc5b36ce32d2b6b8
Glenn Kasten [Tue, 19 Oct 2010 17:42:07 +0000 (10:42 -0700)]
Fix bug
3112893 in handling of container size
Change-Id: Iafa1f823351e5849501ffc613f06940be27e9c6b
Adam Momtaz [Thu, 21 Oct 2010 16:51:46 +0000 (09:51 -0700)]
am
9e617254: Bug#
3111274 - Dump raw audio to file for automated audio quality analysis
Merge commit '
9e6172548bb344c24962c8a57274281e4315feba'
* commit '
9e6172548bb344c24962c8a57274281e4315feba':
Bug#
3111274 - Dump raw audio to file for automated audio quality analysis
Adam Momtaz [Wed, 13 Oct 2010 22:05:11 +0000 (15:05 -0700)]
Bug#
3111274 - Dump raw audio to file for automated audio quality analysis
This change is compiled for userdebug builds only.
The change enables raw audio capture of transcoded music.
The capture is written to file and used for audio quality analysis against the source audio.
This capture feature is OFF by default even for userdebug builds and requires setting a system property to enable it.
Change-Id: I6d895a2fe3ef9741fea490fe2513404a50c4d4b7
Jean-Michel Trivi [Tue, 19 Oct 2010 16:53:31 +0000 (09:53 -0700)]
am
62afe516: Fix bug
3106530 Don\'t report unhandled AudioTrack events as errors
Merge commit '
62afe51646a7299deb7476ff39b4604e421cf433'
* commit '
62afe51646a7299deb7476ff39b4604e421cf433':
Fix bug
3106530 Don't report unhandled AudioTrack events as errors
Jean-Michel Trivi [Mon, 18 Oct 2010 18:12:07 +0000 (11:12 -0700)]
Fix bug
3106530 Don't report unhandled AudioTrack events as errors
Unhandled AudioTrack events were reported as errors, which is
a bug. Added case for EVENT_BUFFER_END and EVENT_LOOP_END. This
covers all events an AudioTrack is expected to generate.
Change-Id: I9ee067f3d42c1d545286001a5702bc606233df9d
Glenn Kasten [Mon, 18 Oct 2010 17:32:39 +0000 (10:32 -0700)]
am
5d9d9153: Merge "Fix bug
3101835 - play state crash" into gingerbread
Merge commit '
5d9d9153fe819ae0f3dd9c53fec109dc4ecf64d9'
* commit '
5d9d9153fe819ae0f3dd9c53fec109dc4ecf64d9':
Fix bug
3101835 - play state crash
Glenn Kasten [Mon, 18 Oct 2010 17:32:36 +0000 (10:32 -0700)]
Glenn Kasten [Mon, 18 Oct 2010 17:32:33 +0000 (10:32 -0700)]
Glenn Kasten [Mon, 18 Oct 2010 17:32:29 +0000 (10:32 -0700)]
am
5c3ca268: Merge "Bug
3102561 - Clean up reverb test" into gingerbread
Merge commit '
5c3ca268853169e457ae7874ba992ce36e894f97'
* commit '
5c3ca268853169e457ae7874ba992ce36e894f97':
Bug
3102561 - Clean up reverb test
Jean-Baptiste Queru [Mon, 18 Oct 2010 15:15:29 +0000 (08:15 -0700)]
Merge
aef1e3da from gingerbread-plus-aosp
Change-Id: I3bfc9d261829332f6c6f2cd4c09be3ea104f0767
Glenn Kasten [Sat, 16 Oct 2010 01:01:36 +0000 (18:01 -0700)]
Merge "Fix bug
3101835 - play state crash" into gingerbread
Glenn Kasten [Wed, 13 Oct 2010 16:52:53 +0000 (09:52 -0700)]
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
Glenn Kasten [Fri, 15 Oct 2010 16:24:32 +0000 (09:24 -0700)]
Fix bug
3101211, partial fix for bug
3101247
IEngine.c: fixed numerous problems found by API test in
Engine::QueryNumSupportedExtensions
Engine::QuerySupportedExtension
Engine::IsExtensionSupported
sles.c:
failed engine create due to resource error did not return correct value
locks.c:
The mutex lock log usually indicates there is a deadlock. However,
it can also happen when there is heavy lock contention, such as
during the multithread torture test. Since it may be may be normal
behavior, I downgraded this log to a warning.
CEngine.c, ThreadPool.h, sles_allinclusive.h, sync.c, Android.mk:
Thread torture test was crashing on all platforms. Partial fix for Android:
- disable sync thread on Android
- disable async realize and async add interface on Android as they are not well tested
COutputMix.c:
Multiple output mixes were incorrectly handled on desktop. The
changed lines are under a non-Android conditional, so don't affect
production builds. But they are necessary in order to develop the
multithread torture test and measure code coverage using it.
Change-Id: I9003e97e0f84d9dc106622b0c925384c8ed61a7e
Glenn Kasten [Sat, 16 Oct 2010 00:17:54 +0000 (17:17 -0700)]
Merge "Bug
3102561 - Clean up reverb test" into gingerbread
Glenn Kasten [Fri, 15 Oct 2010 19:36:45 +0000 (12:36 -0700)]
Bug
3102561 - Clean up reverb test
Change-Id: If573c06134810eafd4d41efeb938fa23ae77c2da
Glenn Kasten [Fri, 15 Oct 2010 19:35:03 +0000 (12:35 -0700)]
Fix bug
3101835 - play state crash
If a prefetch fails due to invalid data source,
then the application sets play state to PLAYING, it used to crash.
Change-Id: Iaba98c596005715ca6c057de543fa0921225e74c
Andreas Huber [Fri, 15 Oct 2010 20:33:38 +0000 (13:33 -0700)]
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Change-Id: I935b8f2851f4bfc244178131acaa913377efa1c2
related-to-bug:
3101573
Jean-Michel Trivi [Fri, 15 Oct 2010 15:33:31 +0000 (08:33 -0700)]
am
ffbd220f: Fix bug
3094729 Support AAC+ in OpenSL ES
Merge commit '
ffbd220f34d275c6231cac8db8f3b50aa16be2b2'
* commit '
ffbd220f34d275c6231cac8db8f3b50aa16be2b2':
Fix bug
3094729 Support AAC+ in OpenSL ES
Glenn Kasten [Fri, 15 Oct 2010 07:05:15 +0000 (00:05 -0700)]
am
80b64591: Merge "Make log less noisy" into gingerbread
Merge commit '
80b645911cfc4ddbd8c011efe55c502cd03c7908'
* commit '
80b645911cfc4ddbd8c011efe55c502cd03c7908':
Make log less noisy
Jean-Michel Trivi [Fri, 15 Oct 2010 06:22:04 +0000 (23:22 -0700)]
Jean-Michel Trivi [Thu, 14 Oct 2010 06:35:56 +0000 (23:35 -0700)]
am
c35fd2e7: Enable aux effect attachment before the AudioTrack creation.
Merge commit '
c35fd2e7ba670b1024a920ebf007b0fa1d92c969'
* commit '
c35fd2e7ba670b1024a920ebf007b0fa1d92c969':
Enable aux effect attachment before the AudioTrack creation.
Jean-Michel Trivi [Wed, 13 Oct 2010 18:31:01 +0000 (11:31 -0700)]
Fix bug
3094729 Support AAC+ in OpenSL ES
When playing an AAC+ stream, StageFright will report a change of
configuration in the stream between the prepare phase and the
start of the playback.
The fix consists in retrieving the new configuration in SfPlayer,
create a new AudioTrack with the new parameters, and notify
AudioPlayer that SfPlayer has a new AudioTrack to use. AudioPlayer
will then delete its current AudioTrack, and use the new one
from SfPlayer, after configuring it with the current AudioPlayer
settings.
Change-Id: I23e3ecb2c144b7c4eefae7a970581695545982d4
Glenn Kasten [Wed, 13 Oct 2010 16:54:43 +0000 (09:54 -0700)]
Merge "Make log less noisy" into gingerbread
Glenn Kasten [Wed, 13 Oct 2010 00:11:21 +0000 (17:11 -0700)]
Make log less noisy
Change-Id: I6a7cb4c8bfca51eae71fb312b8ff43ce663a4c11
Jean-Michel Trivi [Wed, 13 Oct 2010 00:06:36 +0000 (17:06 -0700)]
Fix bug
3090610 Report an error on AAC+
Notify an error occured during prefetching when StageFright
reports that a read error was encountered (other than EOS),
and stop playback.
Change-Id: I0c00ee76b148bd80a26679648322633d6e5533da
Jean-Michel Trivi [Tue, 12 Oct 2010 23:39:49 +0000 (16:39 -0700)]
am
521de5ed: Stop preparing the player if an audio track cannot be found.
Merge commit '
521de5ed291f559f536fd429521b00c67e756725'
* commit '
521de5ed291f559f536fd429521b00c67e756725':
Stop preparing the player if an audio track cannot be found.
Jean-Michel Trivi [Tue, 12 Oct 2010 23:39:33 +0000 (16:39 -0700)]
am
09f19a9d: Merge "Notify when prefetching fails" into gingerbread
Merge commit '
09f19a9d2a340c00429797ca6a21778b99796818'
* commit '
09f19a9d2a340c00429797ca6a21778b99796818':
Notify when prefetching fails
Jean-Michel Trivi [Tue, 12 Oct 2010 21:05:56 +0000 (14:05 -0700)]
Enable aux effect attachment before the AudioTrack creation.
When an OpenSL ES AudioPlayer is playing content from a URI or FD,
the AudioTrack it plays on is only created once prefetching is
far along enough that the playback properties are known (channel
count, word size and sample rate). This happens after Realize()
is called on the AudioPlayer. If, before the AudioTrack is created,
the SLEffectSendItf interface is used to configure the aux send
for that player, there is no AudioTrack to configure.
The fix consists in keeping track of the effect the track needs
to be attached to, and with what level. Once the track is
created, and it gets configured (volume, mutes, channel solos,
marker callbacks) we also attach it to the aux effect if
necessary.
Change-Id: I12230a8cbf7dc3876d3713a006b9702d44e9d6e5
Glenn Kasten [Tue, 12 Oct 2010 18:50:35 +0000 (11:50 -0700)]
am
6f217820: Workaround for build error on sim-eng
Merge commit '
6f2178206003119ad446457c9110abad15223b77'
* commit '
6f2178206003119ad446457c9110abad15223b77':
Workaround for build error on sim-eng