| 4dd35cea9d286fc5ffcdb87c59707208e09aeb07 |
|
30-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5244675 handle the switch cases of AAC decode
Fix handling of AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE decode use case:
- Play::GetPosition: explicitly list decode case and return media
player time; previously returned zero.
- Seek::SetLoop for AudioPlayer or MediaPlayer: return
SL_RESULT_FEATURE_UNSUPPORTED on non-URI data source. This is
correctly passed up to app.
The remaining have no immediate impact, but should make future maintenance easier:
- Play::GetDuration: explicitly list decode case and return unknown time;
no impact as already covered by default.
- Seek::SetPosition: explicitly list decode case and handle as no-op; no
impact as already covered by default.
- Seek::SetPosition for AudioPlayer or MediaPlayer: return
SL_RESULT_FEATURE_UNSUPPORTED with unsupported data source e.g. buffer
queue. No impact as the result is currently ignored, but added a
FIXME to pass this up to app.
- AndroidBufferQueue::Clear: explicitly list decode case as a no-op
other than the partial clear of upper layer queue.
- AndroidBufferQueue::onRefilled: explicitly list decode case as
a no-op, but with a FIXME that this may need more work later.
Change-Id: I53c8a0b736f32cd265ee9c94a70127d4f80869b5
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 183aa1fd76683f3bd7939668c4b02563b5820242 |
|
22-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5198051 MediaPlayer PLAYEVENT_HEAD* callbacks
Change-Id: Ibb04fbf727997281bb77fd22c51cd90bd044e505
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 0f84833ae8640da787339255360d677b9caeab7e |
|
14-Aug-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "AAC buffer decode to PCM buffer queue"
|
| 333c2341445e9f161ff022a4b7d5f69e9e149b60 |
|
27-Jul-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
AAC buffer decode to PCM buffer queue
Implement AAC ADTS decode with buffers of compressed data being
passed to the framework through an AndroidBufferQueue, and
decoded PCM buffers being passed to the application through
a BufferQueue (just like existing decode from URI/FD).
Change-Id: Id992a44a5ca7e404088b929f2b0afe9ca1f85223
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 31b842fa58d602d38cdf2937efc4b47603bbb71e |
|
04-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4603165 playback rate change
Non-trivial implementation is only for AudioTrack with rate range 500
to 2000 per mille and property SL_RATEPROP_NOPITCHCORAUDIO; for Android
MediaPlayer the rate range is 1000 to 1000 per mille.
Details:
- no multi-range
- fix SMP races in GetRate, SetPropertyConstraints, GetProperties
- SetRate only updates mRate if successful
- Rate_SetPropertyConstraints only updates mProperties if successful
- return SL_RESULT_FEATURE_UNSUPPORTED for non-AudioPlayers
which have this interface (currently only MidiPlayer)
- for Android, atomically set playback rate and constraints
and simplify to use hard-coded constraints rather than querying
- per the spec, SetPropertyConstraints now returns
SL_RESULT_PARAMETER_INVALID if the constraints are out of range,
or SL_RESULT_FEATURE_UNSUPPORTED if the constraints are in range but
not supported by this implementation
Change-Id: I051ff92b20f3845ffa12bccec778937d42823e5d
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 7e4729ac84d876de3ae439ae9cfef41701d6a2a2 |
|
25-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4599730 fix mute solo, channel count, volume
Change-Id: I1624c744168233c4ef79f2cd3090447b8aa7d53b
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 0145858a05d704e194ef3f7ac96d7804f08a362f |
|
29-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Call AudioTrack start, stop, and pause when needed
These AudioTrack operations are relatively expensive Binder calls (and
will soon be even more expensive to fix a deadlock at AudioTrack::start),
and they were being called excessively. Now AudioTrack start, stop,
and pause are only called when there is an actual play state change.
Details:
- distinguish ATTR_TRANSPORT vs. ATTR_PLAY_STATE for audio players
- android_audioPlayer_setPlayState is only called when the play state changes
- handler_AudioPlayer_transport is only called for transport changes other than play state
- android_audioPlayer_setPlayState is always called with mutex locked
- since media player currently only handles play state, handler_MediaPlayer_transport
is still called for both ATTR_TRANSPORT and ATTR_PLAY_STATE
- since the handlers for ATTR_BQ_ENQUEUE and ATTR_ABQ_ENQUEUE are only called if in
state PLAYING, changed an "if" to an "assert"
Change-Id: Iee2968fd98d215885b7105053bb1604f962ea337
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| be91f6328a084475e1cf58b54b8b732e088940b5 |
|
16-Jun-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
OpenSL ES: additional features when decoding to PCM
Support the following features useful when decoding a compressed
asset to PCM:
- GetDuration in SLPlayItf
- implemented SLMetadataExtractionItf on an AudioPlayer whose
data sink is a buffer queue (i.e. it's a decoder)
- added support for 6 new metadata keys that can be queried
through SLMetadataExtractionItf, which match the fields
of the SLDataFormat_PCM structure.
Updated the decode sample code to use these features: the
slesTestDecodeToBuffQueue app now displays:
- the number of channels
- the channel mask
- the sample size
- the container size
- the sample rate
- the format endianness
Change-Id: I3ca1e29828fd8c16c89da43a28df429c9cdef7af
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 8ad101d5bcaca289da3d820e2b87b5da55e560f9 |
|
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
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 9e0e6e5c60320dac9aa2abbce2f9a843b8fc4449 |
|
19-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix bug 4109988 fix deadlock on destroy
Fix deadlock with an AudioPlayer playing from a PCM buffer queue.
This type of player uses an AudioTrack that pulls data through
its callback from a buffer queue.
This issue is that when you destroy the player (whick locks the
object), it tries to destroy the AudioTrack object. The
AudioTrack destructor can only finish when the AudioTrack
callback thread can exit. If a callback was underway when
trying to destroy the object, a race condition existed for
the AudioPlayer lock.
The fix consists in using the "pre-destroy" hook for the AudioPlayer
object. In it, we unlock the AudioPlayer, and block until the
AudioTrack callback has signaled it's done. The pre-destroy
hook also marks the track as "about to be destroyed" so any
callback that gets called once the pre-destroy hook has been
called can return immediately.
Change-Id: I4ca69157ff381232c1edc8fb576c6d9e90c2777f
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 5b21a0626e173d407aa3835e5cffcaa9b582016d |
|
07-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 support commands in SLAndroidBufferQueueItf
Support for EOS, DISCONTINUITY, and DISCONTINUITY with
a PTS.
- in IAndroidBufferQueue structure, added buffer type
- modified AdvancedBufferHeader structure to have a buffer
type-specific structure that contains all the items for each
buffer
- added parsing of items when enqueueing a buffer
- enforce buffer size enqueue to be a multiple of MPEG-2 TS
block size for buffer of the corresponding types
- when enqueueing a buffer on an empty queue, implemented
an asynchronous notification on StreamPlayer to consume
the newly queued buffer. Verified this kicks off playback
after having starved the framework for buffers.
- report unknown duration when using AndroidBufferQueue
Change-Id: I9bde97a6c6ffca7d376b4963313b820b35f50a26
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| f65b260193e5ca669ec4479a7e1c4517e18cc6b0 |
|
04-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 TS streaming over SLAndroidBufferQueueItf
Modify the SLAndroidBufferQueueItf interface to offer a model
where buffers of data can be queued along with commands
(messages) when used for playback, or buffers of data can be
received along with metadata (messages)
changes:
- new callback and enqueue functions in SLAndroidBufferQueueItf
and XAAndroidBufferQueueItf.
- definition of a new struct, AdvancedBufferHeader, for
the buffers in the queue.
- decoupling of the "buffer available to be filled" from SF
and the call to the ABQ callback. Implemented in new
file AndroidBufferQueueSource.cpp
- source/sink checks and memory allocation when creating an
AudioPlayer or MediaPlayer that uses SLAndroidBufferQueueItf,
and verifying the data fed to the ABQ is declared as
SL_CONTAINERTYPE_MPEG_TS
- updated tests/native-media XA demo code, and
tests/sandbox/streamSource to use the new interface.
Change-Id: I48e44f346e718041d835fde51e349923fcc1f4b1
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|
| 551f769ee0234ca22c97dbbf84d87f2c1e19fa80 |
|
12-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
More file renames and header inclusion reorder
More file renames and include reordering to separate Android
classes, and the mapping of the C OpenSL ES and OpenMAX AL
function calls to the Android implementation.
Change-Id: Id6f63af80bd581ed9cab495e2c11a86589ecf6c9
/system/media/wilhelm/src/android/AudioPlayer_to_android.h
|