OSDN Git Service
Glenn Kasten [Sun, 23 Jan 2011 19:23:05 +0000 (11:23 -0800)]
Merge "Bug
3326605: AudioRecorder uses wrong channel mask" into gingerbread
Glenn Kasten [Thu, 6 Jan 2011 01:16:13 +0000 (17:16 -0800)]
Bug
3326605: AudioRecorder uses wrong channel mask
Change-Id: I2121211b0202bc39100d74232d63be94c7e8a8de
Glenn Kasten [Sun, 16 Jan 2011 18:08:05 +0000 (10:08 -0800)]
Bug
3360707
Change-Id: Ib40d8813ac713d09ed7b298521fada1a35ecb1d4
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 [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 [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 [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 [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 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
Jean-Michel Trivi [Mon, 11 Oct 2010 23:47:13 +0000 (16:47 -0700)]
Stop preparing the player if an audio track cannot be found.
The bug consisted in not exiting from prepare() if an audio track
couldn't be retrieved from the content to play. This is for
instance the case with unsupported file formats.
Change-Id: Ic48ef5c3bfbfc7d16b241eaacfd26fe1b34e1044
Jean-Michel Trivi [Mon, 11 Oct 2010 23:27:30 +0000 (16:27 -0700)]
Merge "Notify when prefetching fails" into gingerbread
Jean-Michel Trivi [Mon, 11 Oct 2010 23:15:57 +0000 (16:15 -0700)]
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
Glenn Kasten [Mon, 11 Oct 2010 15:53:34 +0000 (08:53 -0700)]
Workaround for build error on sim-eng
This is not a good long-term fix.
target SharedLib: libOpenSLES (out/host/linux-x86/pr/sim/obj/SHARED_LIBRARIES/libOpenSLES_intermediates/LINKED/libOpenSLES.so)
out/host/linux-x86/pr/sim/obj/SHARED_LIBRARIES/libOpenSLES_intermediates/IAndroidEffect.o:(.data.rel.ro._ZTIN7android12SortedVectorINS_16key_value_pair_tImPNS_11AudioEffectEEEEE[typeinfo for android::SortedVector<android::key_value_pair_t<unsigned long, android::AudioEffect*> >]+0x10): undefined reference to `typeinfo for android::SortedVectorImpl'
collect2: ld returned 1 exit status
make: *** [out/host/linux-x86/pr/sim/obj/SHARED_LIBRARIES/libOpenSLES_intermediates/LINKED/libOpenSLES.so] Error 1
Change-Id: Iea6678d31d0f747651285e76f2c2e616937bfbd7
Glenn Kasten [Sun, 10 Oct 2010 23:11:51 +0000 (16:11 -0700)]
Add support for 8-bit and 48 kHz PCM
Change-Id: I9e4ab432dc966d0eb531457b0ca2661d0626255a
Glenn Kasten [Sun, 10 Oct 2010 23:47:10 +0000 (16:47 -0700)]
Fix build warnings
Change-Id: I449da85b97901a632591dd16a52cb924a2722883
Glenn Kasten [Sun, 10 Oct 2010 22:04:20 +0000 (15:04 -0700)]
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
Glenn Kasten [Thu, 7 Oct 2010 21:24:56 +0000 (14:24 -0700)]
More tests and bug fixes
New tests:
- urimime.c tests audio player with URI data source and MIME data format
- dim.c tests DynamicInterfaceManagement
- engine.c new test cases:
- create more than one engine simultaneously
- exit application without destroying engine first
Bug fixes:
- Can't request SLBufferQueueItf or its alias SLAndroidSimpleBufferQueueItf
if the data source is not a buffer queue.
- BufferQueue interface is explicit on AudioPlayer.
- OutputMixExt is unavailable (internal) on AudioPlayer.
- There was a nested mutex lock when resuming a non-suspended interface.
- This implementation supports at most one engine, so check for that
- Class configuration table had wrong entry for DynamicInterfaceManagement
on 4 of 10 classes.
Restore most of the infrastructure for removing interfaces (code review):
- DynamicInterfaceManagement is included, but body of RemoveInterface is compiled
out, and replaced by FEATURE_UNSUPPORTED until all our deinit hooks are clean.
- Remove hook must be called with mutex locked, rather than unlocked as before.
The remove hook is called during IDynamicInterfaceManagement::RemoveInterface
and Object::Destroy, so the entry conditions must be the same.
- Add NULL remove hooks to the interface hook table.
Change-Id: I328dd254ed24a32b220996a6d9592cc8c0f4e943
Miscellaneous:
- Always memset object to garbage in Object::Destroy to catch broken applications.
- Add comments about how GetInterface manipulates the v-table pointer (code review).
- Re-enable DynamicInterfaceManagement for testing the example code.
Glenn Kasten [Wed, 6 Oct 2010 16:52:44 +0000 (09:52 -0700)]
Interface testing and bug fixes
Add some new tests, and fix the bugs they found.
New and improved tests:
Added output mix API test with focus on interfaces.
Add mute solo and seek test cases to the automated buffer queue test.
Buffer queue configuration test is now listenable:
Buffer queue configuration test now generates a sequence of sine
waves in order so that the listener can tell if each format is
supported correctly.
Bug fixes:
Engine::Create... was not checking if the interface was available
for a particular class. Fixing that bug showed some other bugs
in the class/interface configuration tables.
The effects interfaces is available on an output mix.
The Volume interface is not available on an output mix.
The Object interface can do GetInterface before realized.
OutputMix interface is available on an OutputMix;
needed by the demos/examples in back of book
OutputMix::ReRoute fails if number of output device IDs is not 1.
Improve interface checks on a buffer queue source.
Don't allow mute solo interface on a mono buffer queue.
The earlier code to check for seek interface on a buffer queue
compared by address, which didn't work if application
used a private copy of the GUID. Now compares using the
MPH which will work in all cases.
Buffer queue, effect send, and mute solo are explicit interfaces on audio player.
slCreateEngine was not publishing the engine object.
Miscellaneous cleanup:
Removed the hard-coded fake device ID constants in
OutputMix::ReRoute that were there just for testing.
In Engine::Create..., log an error for all unsupported interfaces, not just the first one.
Make hash generator build again:
It turns out interfaces.c is needed, even though it duplicates
OpenSLESUT.c. Restore from
1a6bb4f8e738c9387dc9629db294ea5de618a53c.
Remove some redundant comments.
Change-Id: Iddabe73e298b69a44f3b43ed224c918eb95961a1
Glenn Kasten [Tue, 5 Oct 2010 14:46:26 +0000 (07:46 -0700)]
Object an interface initialization/destroy cleanup
Prior to this, object and interface fields were being initialized
and deinitialized in random places. This resulted in some real and
potential leaks, especially in the case of partial object construction.
There were even some places where fields were not being initialized
at all.
Details:
Move destructor for AndroidEffectCapabilities from CEngine::Destroy
to IAndroidEffectCapabilities deinit hook.
Move destructor for equalizer preset names from CEngine::Destroy
to IEngine deinit hook.
In Object::Destroy, call deinitializer for each initialized interface,
regardless whether it was ever exposed.
Remove double initialization of mStepSize in IPlaybackRate constructor.
Remove obsolete logs.
Add expose hooks that are called when interface is requested in
Engine::Create... or by DynamicInterface::AddInterface.
Always initialize all interfaces, even if not exposed
Fix typos in same-line comments on INTERFACE_ constants.
Add new interface state INITIALIZED: uninitialized -> initialized -> exposed.
DynamicInterface::Remove sets interface state to initialized (but
not exposed), instead of uninitialized.
Add explicit constructor calls to initialize fields in C structs
(e.g. smart pointers), using placement new. See also build warning
which was turned off with -Wno-invalid-offsetof.
Add comments about per-instance fields not associated with an interface.
Add default initializations for all per-instance fields that are
not associated with an interface, in case the object is only partially
constructed and then needs to be destroyed due to an error.
Add placement new comments.
Update comments on private per-instance fields not associated with an interface.
Move effect clears from the containing object destructor
(CAudioPlayer_Destroy and COutputMix_Destroy) to the interface
destructor. In this process this caught a bug that environmental
reverb and preset reverb were not being destroyed properly for an
audio player.
Add comments on interface hooks.
Add entries for interface destructors.
Add placement new (explicit constructor) and explicit destructor calls
for C++ fields in C struct.
Fix template instantiation error.
Move explicit calls to IBufferQueue_Destroy (now renamed to
IBufferQueue_deinit) from CAudioPlayer_Destroy and CAudioRecorder_Destroy
to be implicit via the BufferQueue interface deinit hook.
ThreadSync interface destructor now logs a warning if
ThreadSync::EnterCriticalSection was active at Engine::Destroy
Add some comments.
Clean up gMonitorFp close code.
Fix typo in log message.
Fix DynamicInterface to handle distinction between UNINITIALIZED and
INITIALIZED states for an interface, and to call the optional expose hook.
Do not use memset per interface, because the size of the last interface is unknown.
Set the v-table pointer while lock is held.
Add curlies to if statements.
Log errors if interfaces active during Object::Destroy, instead of asserting.
Log a warning if interface requests an interface but it is not available,
and is optional.
Add log with the class name and address of each new object.
Mark only interfaces with init hooks as INITIALIZED; others are UNINITIALIZED.
Change-Id: Ibb9c1b5f21e6195af6b20b2f7a5c7157905b735b
Glenn Kasten [Thu, 30 Sep 2010 18:09:19 +0000 (11:09 -0700)]
Add new test, fix bugs found by test & code review
Bugs:
- EnvironmentalReverb::GetEnvironmentalReverbProperties left mutex
unlocked at end.
- buffer queue configuration test revealed not checking enough
combinations
- would have failed conformance test in a couple places
- replace peek locks by shared locks for SMP
- undocumented symbols were being exported by library
- fix handling of EffectSend for MIDI player
New test:
- Add reverb test
Miscellaneous:
- Move some FIXME to to-do list where they are easier to organize
- Fix typos in name of profile constant
- EffectSend::IsEnabled sets enabled = false for unsupported aux effect.
- Add curlies to if statements.
- Add more error logging.
- Fix indentation in switch statement.
- Add comments to makefile.
Details:
- Reduce visibility of libOpenSLESUT symbols.
- Use LOCAL_STATIC_LIBRARIES := libOpenSLESUT where needed in
applications.
- Move FIXME for OEM configuration, interface, SDL, Sndfile,
buffer queue, destroy to to-do list
- For SDL, disallow buffer queue with source not 44.1 kHz because it
is hard-wired to 44.1 kHz and there is no sample rate converter.
- return successful result for enabled effect send on unsupported
MIDI player
for future conformance testing
Change-Id: I39cb543169996f78c16e3ac363ea6157a9242743
Glenn Kasten [Thu, 30 Sep 2010 00:33:21 +0000 (17:33 -0700)]
Merge "Add buffer queue configuration test" into gingerbread
Glenn Kasten [Wed, 29 Sep 2010 23:37:02 +0000 (16:37 -0700)]
Add buffer queue configuration test
Add comments to makefile for each test
Change-Id: I8741d93e7aadb02c4b75e3a0a7a81d593dfa7f97
Jean-Michel Trivi [Wed, 29 Sep 2010 22:51:44 +0000 (15:51 -0700)]
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
Jean-Michel Trivi [Wed, 29 Sep 2010 19:55:40 +0000 (12:55 -0700)]
Code cleanup: function name unification.
Change-Id: I37790738d81bb8d6b5496467a93c17c6f1385b8f
Jean-Michel Trivi [Wed, 29 Sep 2010 01:08:55 +0000 (18:08 -0700)]
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
Glenn Kasten [Tue, 28 Sep 2010 22:54:50 +0000 (15:54 -0700)]
Merge "Add MuteSolo checks for audio player and fix bugs" into gingerbread
Glenn Kasten [Tue, 28 Sep 2010 14:28:21 +0000 (07:28 -0700)]
Add MuteSolo checks for audio player and fix bugs
The specification says "This [SLMuteSoloItf] interface cannot be
exposed on a player whose audio format is mono." This has a lot of
implications ...
Deny an explicit interface request for SLMuteSoloItf at audio player
creation time if the player is known pre-realize to have mono channel
count (e.g. PCM buffer queue).
Deny a GetInterface on MuteSolo if channel count is known to be mono,
but allow it if the channel count is still unknown.
When DynamicSource (or its replacement) is implemented, it will be
possible for the application to have done a GetInterface successfully,
and then to change the source such that the MuteSolo interface is
no longer valid. In that case, return SL_RESULT_FEATURE_UNSUPPORTED
for most MuteSolo operations, if called when channel count is unknown
or is mono. We _do_ allow MuteSolo::GetChannelCount to succeed if
channel count is known to be mono.
Enhance the URI-based mute solo test to check some of the above,
and the interactive buffer queue test to get and test the channel count.
Add curly braces to if statements.
Other bug fixes:
- Do not rely on peek locks; they don't work on SMP.
- Channel count and sample rate were not being set correctly
for buffer queue data source audio players.
- CreateAudioPlayer and AudioRecorder were both referring to
application pointers more than once, with the possibility of
reading inconsistent data.
Change-Id: Ie0109cbddc0aff8a56c0b53d989fb2be823e627b
Jean-Michel Trivi [Tue, 28 Sep 2010 16:50:19 +0000 (09:50 -0700)]
Merge "Fix bug
3004701 do not prefetch during Realize." into gingerbread
Jean-Michel Trivi [Tue, 28 Sep 2010 00:12:52 +0000 (17:12 -0700)]
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
Glenn Kasten [Tue, 28 Sep 2010 00:30:18 +0000 (17:30 -0700)]
Enable and test more interface ID queries
Enable Engine::IEngine_QueryNumSupportedInterfaces and
Engine::QuerySupportedInterfaces.
Add object ID test.
Return SL_RESULT_FEATURE_UNSUPPORTED from Engine::Create... if the
corresponding class is not configured..
Add slesutObjectIDToString to utility toolkit.
Change-Id: I28b8beff71d65e7eccd558e586652bb606c89848
Glenn Kasten [Tue, 28 Sep 2010 00:05:49 +0000 (17:05 -0700)]
Add engine interface test
Change-Id: I5c1fd1e8ab6dc050f416f28708e3ef218910cd8d
Glenn Kasten [Tue, 28 Sep 2010 00:13:09 +0000 (17:13 -0700)]
Merge "Destroy for an unrealized engine was hanging" into gingerbread
Jean-Michel Trivi [Tue, 28 Sep 2010 00:05:06 +0000 (17:05 -0700)]
Remove old stream type code that's not used anymore.
Change-Id: I66e0d93ffa8fbf8fd64642d5554026513d561153
Glenn Kasten [Mon, 27 Sep 2010 23:35:50 +0000 (16:35 -0700)]
Destroy for an unrealized engine was hanging
Change-Id: Ib11b15fe40726d2f9aad0c54fa66382824c95cfa
Glenn Kasten [Mon, 27 Sep 2010 15:37:09 +0000 (08:37 -0700)]
Initialize mEffects if audio player partly created
See https://android-git.corp.google.com/g/70088
File opensles/libopensles/android_AudioPlayer.cpp
Line 1111: if (NULL != pAudioPlayer->mAndroidEffect.mEffects) {
mAndroidEffect.mEffects is not initialized to NULL.
Change-Id: Ic6b952748c7a8024c797d7bec4a26cb138fa8840
Jean-Michel Trivi [Mon, 27 Sep 2010 17:50:34 +0000 (10:50 -0700)]
Fix AudioTrack sessionId bug
The sessionId associated with an AudioPlayer is initialized during
its creation. The sessionId was not passed to the AudioTrack
constructor.
Change-Id: I9ccafd707313367f8da78013575cd6048637f240
Jean-Michel Trivi [Mon, 27 Sep 2010 16:49:47 +0000 (09:49 -0700)]
Remove unused Android object type AUDIOTRACK_PUSH
Change-Id: I1ab5494ae47239eed0b0a18dc817e3b0ead37871
Jean-Michel Trivi [Mon, 27 Sep 2010 16:37:38 +0000 (09:37 -0700)]
Merge "Support content looping for URI and FD data sources." into gingerbread
Jean-Michel Trivi [Sun, 26 Sep 2010 20:15:05 +0000 (13:15 -0700)]
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
Glenn Kasten [Sun, 26 Sep 2010 21:51:17 +0000 (14:51 -0700)]
Restore the 2 unmerged equalizer tests
Change-Id: I667cfdddd34fff7017fedab9ee84e954c1c9f690
Jean-Michel Trivi [Sun, 26 Sep 2010 21:20:27 +0000 (14:20 -0700)]
Log which effect initialization function is used.
Change-Id: I7c5c7440e50d65faf3dadf360e7a3a23dc5d7781
Jean-Michel Trivi [Mon, 20 Sep 2010 23:01:25 +0000 (16:01 -0700)]
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
Glenn Kasten [Sun, 26 Sep 2010 19:04:19 +0000 (12:04 -0700)]
Temporary fix for broken build
Change-Id: I1b02cbe6ce22766ccbab4e8bf040418eba69d6fc
Glenn Kasten [Sun, 26 Sep 2010 16:38:26 +0000 (09:38 -0700)]
Replace one configuration hack by another
Previous hack allowed an application to call GetInterface for any
interface prior to Realize. The new hack allows an application
to do so only for interfaces which have a "pre-realize OK"
relationship to their associated class. Currently this is
SL_IID_ANDROIDCONFIGURATION.
Reduce logging in record test.
Allow default tracing level to be set in makefile.
Line length 100.
Change-Id: Id17c55ee7284dca108e0eab379a8f987963fd8c4
Glenn Kasten [Sat, 25 Sep 2010 00:39:09 +0000 (17:39 -0700)]
Cleanup
Remove obsolete source file interfaces.c.
Fix typo in conditional compile.
Clarify comment.
Change-Id: I46e93c61fc0d192118a0f17b5b735ec2118298df
Glenn Kasten [Fri, 24 Sep 2010 21:16:15 +0000 (14:16 -0700)]
Fix problems found during testing
Fix crash in android_audioPlayer_destroy if audio player is only partially
constructed, e.g. when using a buffer queue source and the buffer count
is invalid etc.
Add temporary workaround to buffer queue automated test to be quieter if
hardware volume control is not working.
Make the record test less noisy on console.
Change-Id: Ief255c3f5f3c94c990f589b2373686b2ac526dd3
Glenn Kasten [Thu, 23 Sep 2010 01:55:12 +0000 (18:55 -0700)]
Fix bug found by BufferQueue automated test
Fix bug for destroying partially constructed audio player.
Remove obsolete logging.
Change-Id: Ib186153bf50ed1311c021d53711ec90d000bdee2
Glenn Kasten [Tue, 21 Sep 2010 21:49:48 +0000 (14:49 -0700)]
As part of API review, disable incomplete profiles
Don't compile dead code relating to unsupported features, but keep profiles for CT.
Move whole file conditionals from the source code to Android.mk,
by just not compiling the module for unsupported features.
There must an interface initialization hook present to expose an
interface implicitly or explicitly at object creation time, or
to dynamically add an interface after the object is created. As
a safety check, we also double-check for the initialization hook
when the application does a GetInterface.
Miscellaneous bug fixes:
- Fix warning "variable may be used uninitialized in this function".
- Fix build errors on SDL.
- Was using the wrong conditional for SDL.
- Fix typo mInterfaceContinued -> mInterfaceStates2 in AudioRecorder.
- Fix typo in IEngineCapabilities_init.
Other cleanup:
- Move ugly SDL-specific stuff out of the portable code.
- Combine duplicated code in CAudioPlayerDestroy and
CAudioRecorder_Destroy for freeing buffer queue memory.
- Add curlies to if and do statements.
- Line length 100.
- Decrease engine voices from 32 to 30 (based on max of 32 objects, 1 engine, 1 output mix).
- Disable IRecord_init log.
- Add symbolic link for Android configuration header file.
- Enable trace on Android.
- sl_int64_t is now unconditionally defined rather than only if
ANDROID defined, because it is used by OpenSLES_Android.h which
might be included by SDL also.
- Removed symlink for Android headers
Change-Id: I1a6389257bca09e3819923129a1193473e16669b
Glenn Kasten [Tue, 21 Sep 2010 23:56:15 +0000 (16:56 -0700)]
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
Glenn Kasten [Tue, 21 Sep 2010 23:20:16 +0000 (16:20 -0700)]
Add explicit dependency to utility library.
Change-Id: I3a85b071b355ac9e0c330a71e6457cb01b665af0
Glenn Kasten [Tue, 21 Sep 2010 22:59:30 +0000 (15:59 -0700)]
Quick fix for build break, real fix to follow
Change-Id: Ib8542a689a0287fe19cd74b14eceb6b4a8b6afeb
Glenn Kasten [Mon, 20 Sep 2010 18:55:34 +0000 (11:55 -0700)]
Update logging
Fix bug in ifdef __cplusplus for OpenSLES_Android.h.
Clean up, simplify, and change level of a few log messages.
Use SL_LOGx macros instead of LOGx in SfPlayer.cpp.
Add comments regarding unsupported runtime log level checks.
Line length 100.
Change-Id: I52441ed6fbe9550248fa1b6944fc8e199f1f2724
Jean-Michel Trivi [Tue, 21 Sep 2010 18:32:41 +0000 (11:32 -0700)]
Fix bug
3022251
Remove prefetch status error codes: not officially in OpenSL ES spec.
AndroidEffectCapabilities: no const for effect name
Android file descriptor data source: don't use a value that will
likely be used by the specification in the future.
Change-Id: I9b4e0d7eb265dc98c76021cddfe5a1f50b5eb6ef
Jean-Michel Trivi [Mon, 20 Sep 2010 17:35:03 +0000 (10:35 -0700)]
Merge "Fix bug
3011821 OpenSL ES Volume chain configuration" into gingerbread
Jean-Michel Trivi [Mon, 20 Sep 2010 00:37:01 +0000 (17:37 -0700)]
Fix bug
3011821 OpenSL ES Volume chain configuration
When setting effect send levels, combine player volume level
with send level since AudioTrack doesn't have a distinct volume
and direct level. This fix ensures the send level changes
according to the player level, without being affected by direct
level changes.
When setting player volume, update the send level.
Change-Id: I372434267a7107c617a0fdd8c39e92e31e4c339b
Glenn Kasten [Mon, 20 Sep 2010 16:40:23 +0000 (09:40 -0700)]
Merge "Enable semi-standard logging (does not use LOG macros)" into gingerbread
Glenn Kasten [Mon, 20 Sep 2010 16:18:40 +0000 (09:18 -0700)]
Enable semi-standard logging (does not use LOG macros)
This is a workaround for conflict in Stagefright's definition of LOG.
Change-Id: I985e2c08d6e86a1664654a2e8a0b8aea145b32ba
Jean-Michel Trivi [Mon, 20 Sep 2010 03:38:56 +0000 (20:38 -0700)]
Fix AudioRecorder initialization error.
CAudioRecorder fields mNumChannels and mSampleRateMilliHz are
initialized in IEngine.c CreateAudioRecorder(). It is an error
to reset them in the Create of AudioRecorder.
Change-Id: I61568b225ad1303a3f8b0d846aac8c0b848386f1
Jean-Michel Trivi [Mon, 20 Sep 2010 02:21:36 +0000 (19:21 -0700)]
Fix bug
3009239
Query AudioRecord position for SLRecordItf->GetPosition()
Change-Id: I1a520b281d44105d34c92fd555e71013d5170c76
Jean-Michel Trivi [Sun, 19 Sep 2010 22:04:23 +0000 (15:04 -0700)]
Change object state test for SLAndroidConfigurationItf.
Change-Id: Iabd024720f361bcfa50f3a5daa433afa6caa4930
Jean-Michel Trivi [Fri, 17 Sep 2010 23:03:11 +0000 (16:03 -0700)]
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
Yu Shan Emily Lau [Sat, 18 Sep 2010 01:00:33 +0000 (18:00 -0700)]
Merge "Turn on the opensl samples." into gingerbread
Glenn Kasten [Thu, 16 Sep 2010 22:55:29 +0000 (15:55 -0700)]
Improve reliability of Object::Destroy / Create
Separated object construction from publishing, for better safety
with respect to the sync and debugger thread. Unpublished objects
exist and have an ID slot reserved, but the ID is not assigned.
Destroy of an unpublished object does the right thing.
Add pre-destroy checks:
- COutputMix all platforms: add check for players attached to
output mix. Object:: Destroy on an output mix that has at least
one attached player is a no-op, but will log an error.
- COutputMix for SDL: now asks the mixer callback to unlink output
mix from engine, and then blocks until SDL mixer callback
acknowledges the request; this avoids a race condition where the
SDL thread calls the mixer during destroy.
- C3DGroup: add check for players in group.
Object::Destroy on a 3D group that contains at least one player
is a no-op, but will log an error.
Object::Destroy on an audio player that is part of a 3D group now
removes the player from the 3D group during destroy.
Remove redundant field:
- CAudioPlayer.mOutputMix duplicated a field in DataSink.DataLocator_OutputMix;
removed mOutputMix and replaced by function CAudioPlayer_GetOutputMix
which gets the output mix from the data sink.
Remove dead code:
- IOutputMixExt_Destroy was obsolete.
Miscellaneous changes not related to destroy:
- Fixed an ancient bug in the class table for Listener object -
was using wrong offset for interfaces.
- Add curly braces around if, else, for bodies
- Add parentheses around complex conditionals
- Add some logging
- Fix indentation.
- Line length 100
Change-Id: I0035fe356e2a28c1932b5d265f881377aa77dc58
Yu Shan Emily Lau [Sat, 18 Sep 2010 00:19:31 +0000 (17:19 -0700)]
Turn on the opensl samples.
Change-Id: I0ca645fe506e8690d960bf113472a400cd422ea3
Jean-Michel Trivi [Fri, 17 Sep 2010 21:33:31 +0000 (14:33 -0700)]
Allow Android stream type to be set by SLAndroidConfigurationItf.
Allow Android stream type to be set through the
SLAndroidConfigurationItf interface, instead of the
SLAndroidStreamTypeItf interface, which is going away before
release.
The stream type is now stored in CAudioPlayer, and used before
the AudioTrack of the player is instanciated.
AudioRecorder preset and AudioPlayer stream type also implement
the following behavior: when querying a key with a NULL pointer
as destination for the value, the value size is updated with
the actual size used to store the value for the given key.
Change-Id: I652a5b463a220698c53fc1d2b485143b794a1d75
Jean-Michel Trivi [Thu, 16 Sep 2010 23:29:12 +0000 (16:29 -0700)]
Add example for SLRecordItf callback registration and use.
Change-Id: Ibcd27f5a49a42ddbcd313b30e7b07b1ce4f13705
Jean-Michel Trivi [Thu, 16 Sep 2010 23:28:42 +0000 (16:28 -0700)]
Merge "Signal recording buffer overrun with SL_RECORDEVENT_HEADSTALLED." into gingerbread
Jean-Michel Trivi [Thu, 16 Sep 2010 17:03:00 +0000 (10:03 -0700)]
Signal recording buffer overrun with SL_RECORDEVENT_HEADSTALLED.
Signal recording buffer overrun with SL_RECORDEVENT_HEADSTALLED,
not SL_RECORDEVENT_BUFFER_FULL because this latter is not
appropriate when recording to a buffer queue, and implies that
recording stops when it is hit.
Fix locks in IRecord.c: should be exclusive when changing
record attributes.
Change-Id: I763483a54c92128e3fba9d9c97a091f727f4f7fc
Glenn Kasten [Thu, 16 Sep 2010 21:33:44 +0000 (14:33 -0700)]
Make hashgen build again, and update the hashtable
Change-Id: Id0e5a25208adb4cef7f1d04fd3cceaff2a7a4554
Jean-Michel Trivi [Thu, 16 Sep 2010 01:28:44 +0000 (18:28 -0700)]
Fix bug
3003630
Support record events HEADATMARKER, HEADATNEWPOS, BUFFER_FULL.
In SLPlayItf, remove useless boolean field for marker set and,
like in SLRecordItf, make ClearMarkerPosition() reset the
marker to 0.
Change-Id: Iac624d218b79fa7540c371d403de27bc5c291176
Jean-Michel Trivi [Wed, 15 Sep 2010 22:55:11 +0000 (15:55 -0700)]
Store sessionId in AudioPlayer.
Store sessionId in AudioPlayer so it can be passed directly to
resources that need it, and the same session is kept during
the lifetime of the AudioPlayer object.
Change-Id: I97c46c88cfb9cc7a8147909f379716522c695b9d
Jean-Michel Trivi [Wed, 15 Sep 2010 20:49:21 +0000 (13:49 -0700)]
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
Eric Laurent [Wed, 15 Sep 2010 16:39:19 +0000 (09:39 -0700)]
Fixed C/C++ interworking problem in IAndroidEffect
The IAndroidEffect structure contains a KeyedVector object
which constructor was not called when the structure was allocated.
The fix consists in changing the structure member to a pointer
to a KeyedVector and create the object from C++ code when the
object containing the IAndroidInterface is created (AudioPlayer
and OutputMix).
Change-Id: I328b4b61537ddb178b33427c6bad06678a29647a
Jean-Michel Trivi [Wed, 15 Sep 2010 16:04:14 +0000 (09:04 -0700)]
Merge "Add prefetch status error definitions." into gingerbread
Jean-Michel Trivi [Wed, 15 Sep 2010 00:07:32 +0000 (17:07 -0700)]
Rename default recording preset to generic.
Change-Id: I77144ebcc593001ca60b94f0176fc2287e7400fd
Jean-Michel Trivi [Tue, 14 Sep 2010 23:23:32 +0000 (16:23 -0700)]
Add prefetch status error definitions.
Add prefetch status error definitions as defined in post SL ES 1.0.1.
Add fixmes for Android extension discovery.
Change-Id: I36161013f121b0fb0748311df9e8167e45f88808
Jean-Michel Trivi [Tue, 14 Sep 2010 01:24:59 +0000 (18:24 -0700)]
Implement SLAndroidConfigurationItf on AudioRecorder.
Enable the use of the configuration interface before the
AudioRecorder object is realized to set the recording
preset. Recording presets map to the Android
AudioRecord input source.
Change-Id: I804095a0b39e4676862f6bc8e7fbaa0ba63b9336
Glenn Kasten [Mon, 13 Sep 2010 23:57:10 +0000 (16:57 -0700)]
Reduce .so size and hide internal global symbols
Change-Id: I95b63aa1f4da94ad068619ff0944e4ff83fc6fd6
Glenn Kasten [Fri, 10 Sep 2010 00:20:13 +0000 (17:20 -0700)]
Fix some race conditions and deadlocks.
Use strong reference counts to fix race conditions in these object dependencies:
- audio player on 3D Grouping
- MIDI player (or more specifically, the data sink locator) depends on LED or Vibra device
- audio player (or more specifically, the data sink locator) depends on output mix
Fix build errors on non-Android platforms.
Fix incorrect result code for EnvironmentalReverb::SetDensity.
Continue work on making Destroy more reliable:
- Destroy calls a pre-destroy hook, e.g. for Android audio players.
- Add new internal object state DESTROYING which is set when the pre-destroy hook returns.
- Abort (called by Destroy) now blocks until all async operations complete or are aborted.
Add curly braces around simple if and for statements.
Add extra parentheses around complex if expression in if statements.
Add more error logging in checkDataLocator.
Add Doxygen comments.
Remove spurious log entry when SL_DATALOCATOR_ANDROIDFD used.
Disable the unused Resume hooks, which are currently unused.
Remove some dead code in audio player create for Android.
Line length 100.
Prepare for fixing race condition in OutputMixExt by
moving mActiveMask and mTracks from IOutputMix to IOutputMixExt.
Update comments.
Continued work on Destroy reliability:
Do not poke around in mixer's data structures directly during
Object::Destroy for an audio player; instead ask the mixer nicely
and wait for it to do the job.
Move master copy of computed gains from Track to AudioPlayer, and then
let the mixer copy the gains locally when it needs them.
Add resume and predestroy hooks everywhere.
Predestroy hook returns a boolean.
Jean-Michel Trivi [Sun, 12 Sep 2010 21:58:04 +0000 (14:58 -0700)]
Add SLAndroidConfigurationItf, enabled on AudioRecorder.
This adds a generic configuration interface, first enabled on the
AudioRecorder object. This is intended to be used to configure
the audio recording source. It is meant to be usable before the
object is in REALIZED state.
Change-Id: I8f6c1cf8f5be8a8dfb332c4e89d91f45047f48e3
Jean-Michel Trivi [Sun, 12 Sep 2010 18:06:51 +0000 (11:06 -0700)]
Hide media player looper from AudioPlayer.
The ALooper that takes care of the rendering loop in SfPlayer is
only used inside SfPlayer. This CL makes SfPlayer manage the
lifecycle of its rendering looper.
Change-Id: Ia4d5e02ce0a44bcf79021f428b490612a9fead9c
Jean-Michel Trivi [Fri, 10 Sep 2010 17:47:17 +0000 (10:47 -0700)]
Implement the SLAndroidEffectSendItf.
This enables sends from an AudioPlayer to an OutputMix
that's using the generic effect interface (SLAndroidEffectItf).
Since there is a single aux bus, the effect ID is only used
to verify the effect referred to in the send is actually
attached to the OutputMix. Also there is a single send
level value and enable flag for the interface, even though
the interface definition supports discerning between multiple
effects (so it scales on platform with multiple aux buses).
Dry (direct) level is now stored in the AudioPlayer,
as it is shared between SLEffectSendItf and
SLAndroidEffectSendItf.
Change-Id: I3dd34c4c045d8ac2961a325e10b181a789bf4913
Jean-Michel Trivi [Thu, 9 Sep 2010 18:26:22 +0000 (11:26 -0700)]
Definition of SLAndroidEffectSendItf
Define the SLAndroidEffectSendItf interface which mirors the
SLEffectSendItf interface, but uses an SLInterfaceID parameter
to identify the effect the AudioPlayer is sending to.
Change-Id: Iec0ddf315a6974fafedecd566bd01c7231183312
Jean-Michel Trivi [Thu, 9 Sep 2010 00:56:50 +0000 (17:56 -0700)]
Fix aux reverb issues:
- when creating an effect, only pass the effect type to the
AudioEffect framework so it selects whether to use an insert
or aux effect based on the session.
- SL ES aux reverb effects don't have an explicit SetEnabled()
function, so enable the effect upon creation, or based on the
preset for the preset reverb effect.
Add a test for SLEffectSend.
Change-Id: I683331cac19cf1fb9628d636569ab3d342c02820
Yu Shan Emily Lau [Wed, 8 Sep 2010 22:59:03 +0000 (15:59 -0700)]
Fixed the make file which it can build all the sub-dir.
Remove the samples temporary until it's fixed.
Change-Id: I6dd9b15a16c3dcc22ecee1fd1acecaebbd59262f
Jean-Michel Trivi [Wed, 8 Sep 2010 18:18:30 +0000 (11:18 -0700)]
Fix automated tests testPlayAbsPath and testPlayfilePath
Do not rewind when reaching the end of the stream.
Change-Id: I98fa7cebc2b2d8fa8d10d371cfb78f24fb1ab277
Jean-Michel Trivi [Wed, 8 Sep 2010 17:06:49 +0000 (10:06 -0700)]
Support SLAndroidEffectItf on the OutputMix object.
Change-Id: I098dc047ce91848781c9ba18beec5a33abd50e68