| 8d7bd3c0c920ba70cbf3cc762411902c94c35253 |
|
26-Oct-2011 |
Andreas Huber <andih@google.com> |
Remove MediaPlayer::setVideoSurface legacy.
Change-Id: I95aa181f39b375087b30ac65fea37589108c9f16
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 13ffc7f7c69e2fabf1ef70ebb2ea81489be9bd74 |
|
28-Oct-2011 |
Glenn Kasten <gkasten@google.com> |
am d0b07222: Merge "Bug 5526807 inform client of errors after prepare" into ics-mr0
* commit 'd0b0722276aea9a06a118a64abfc8b3e9498e931':
Bug 5526807 inform client of errors after prepare
|
| 31cc0d9597a502a2c81ff318556adde92d50590a |
|
27-Oct-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5526807 inform client of errors after prepare
Change-Id: Ic5c88f8e1c8e7d6226a7a71a2a89a70f0fa876f8
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 891673f650f233f17f60e2c663fa24279b8dc9af |
|
30-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Fix race in getting duration
mDuration is protected by mSettingsLock because it is accessed from both
the ALooper thread and from the application thread, but only one of the
two "set"s was using the lock, and the "get" was not using the lock.
Also added some comments about the lock, and moved lock closer inside { }.
Change-Id: I7c96186f31baaad1b941d934549cb50d4f82d0c8
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| e851581e7a62192f69626b9a0d2e5380a4d3979c |
|
30-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Multithread safety and code reduction
Remove unsafe GenericPlayer::getSampleRate(). getSampleRate() was not
thread-safe as it accessed a member variable updated in the looper thread
without a lock. If getSampleRate() is ever needed again, the sample rate
is available in the mPcmFormatValues array, which does have a lock.
Replace member variables mChannelMask, mChannelCount, and mSampleRateHz
by local variables for locality and performance.
Change-Id: Ibf92ed090430153d748ded4d0b835e429df47eea
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 22c4f2714b5a419ba350ba733a78d17e09fbd2c3 |
|
29-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5385386 missing HEADATNEWPOS
Workaround for mediaserver bug where it does not send MEDIA_SEEK_COMPLETE
to the MediaPlayerNotifier after a discontinuity is processed.
Instead, we simulate a seek complete event in this case.
A short delay is applied to compensate for shared memory latency.
A longer-term fix will be to have mediaserver send the event.
Change-Id: Id0d01b842a145fa5762d44f03144741152f7b03f
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 563ba31c5b77092d3d2672a3ee89f1eaeed1aeb5 |
|
17-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Remove dead code
AudioPlayback_Parameters fields trackcb and trackcbUser
audioTrack_callBack_uri
android_Player_androidBufferQueue_registerCallback_l
GenericPlayer field mLooperPriority
StreamPlayer::registerQueueCallback
CAudioPlayer::mpLock
AudioSfDecoder::startPrefetch_async
IAndroidBufferQueue does not support AudioRecorder object
android/BufferQueueSource.h #include
Change-Id: I9d7cef243167e10279df452e7c62e66d8f5fe3b6
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 819ab3a683b0a94471fcb32b4cf9977d8a5086e8 |
|
12-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5090073 Callback protectors
Add callback protector for decode to PCM usage cases.
Move callback protection up earlier for URI decode use case only.
Other:
Remove redundant mCallbackProtector field.
Optimization: on exit from callback protector, only broadcast if !mSafeToEnterCb,
that is if destroy has requested callback protectors to finish up.
More callback protector logging.
Add callback protector requestCbExit() [no wait], not yet used.
Unrelated:
3rd parameter of adecoder_writeToBufferQueue is always CAudioPlayer * instead of void *.
Change-Id: I57a46acf0e5ecb213540b13ca08098177ad7ad6e
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| becfe88080f47bce3206836abf738ffddeb5cc47 |
|
15-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5263052 play events for decoder use case
This version should be more resilient to decode time vs. real time.
Miscellaneous:
- comment about GetPosition accuracy
- remove unused AudioSfDecoder::onRender implementation
Change-Id: I16a7726e0b1459ed1421fe50cb4d683d5c3bdd6b
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 5f542f6e29f76ccc34d3072c13638e84d7b88496 |
|
09-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5287555 create StreamSourceAppProxy once
Create StreamSourceAppProxy once in the StreamPlayer constructor,
rather than dynamically in StreamPlayer::registerQueueCallback.
As StreamPlayer::registerQueueCallback can be called multiple times
(or even not at all), this guarantees we always have only one
StreamSourceAppProxy that never changes.
Also fix bug where we weren't using a stream protector for AudioPlayer
with MPEG-2 TS AndroidBufferQueue data source (we weren't calling
setCallbackProtector on it).
This has some unexpected side benefits of simplifying the code:
- remove unused parameters and member variables
- mAppProxyLock not needed since the callback protector is created early
- remove GenericPlayer::setCallbackProtector
- inline android_StreamPlayer_realize_l for the use case
AUDIOPLAYER_FROM_TS_ANDROIDBUFFERQUEUE to be like MediaPlayer
Change-Id: I090c11cde9474285185481192dba2b5c01338a50
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| abf6db3696e93960f7bc943e8235ba31f73e5c3f |
|
24-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5193695 Fix crash after MediaPlayer destroyed
The StreamSource callback thread was continuing to run after the
MediaPlayer object was destroyed. Fixed by adding a callback protector
and a pre-destroy hook. GenericMediaPlayer::preDestroy now also
calls MediaPlayer::stop just in case.
Change-Id: I5bd771d4d1936f433d2a8c9959593782c96daed9
Miscellaneous:
- added an explicit destructor on CMediaPlayer::mAVPlayer for consistency
(probably not a bug since there was a clear on it earlier)
- updated comments for CallbackProtector
- made some CallbackProtector fields private since no sub-classes yet
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| d62f504ebe6a3f9b15c6115f9add1c4fed87d847 |
|
11-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5153313 keep compatibility of local files URI
Also fix a bug in decode from fd to PCM buffer queue, where
we were closing the application's fd.
Change-Id: I220cd1c242f2f5e240b4dd1b9e8d79c88878bdcd
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| feab9b6558fd4d08de14a54c30d1ffc46d41be92 |
|
19-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 5126938 dependency for video sinks"
|
| 6bd00f9169990c3b9e84b03ef1c5c27ed50a37d1 |
|
13-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5161265 Recover from mediaserver process crash
Use the utility method IMediaDeathNotifier::getMediaPlayerService()
to get a reference to media player service. It retries after errors,
and keeps a single global per-process reference to the service rather
than one per object. If we still can't contact the media player service
after retries, handle it like an unsuccessful prepare.
Miscellaneous:
- Remove unused field Parcel metadatafilter
Change-Id: I451a64bd76b4a7f157774abe967448ec081f1014
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 39671763229bf1140c8e1c1b6cd4c072cbd4eb6c |
|
08-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5126938 dependency for video sinks
Fixing bug 5126938 will involve configuring the video sink in two places:
at the initial data locator when creating the MediaPlayer object, and
then later in the IAndroidConfiguration interface. This CL is preparation
for that.
Details:
- Abstract out common code into android_Player_setNativeWindow.
- Move the code for checking and initializing the video sink from an
#ifdef ANDROID in the CMediaPlayer_Realize portable code to into
platform-specific android_Player_realize.
- Only set one of mSurface or mSurfaceTexture to non-NULL.
- For methods which can't fail, replace the SLresult return value by void.
Change-Id: Iec8fd91e1a6de45eb64241b35e3f7d7faf63d727
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 8c2aa18530c67c95852f98e291ee9167bc680de8 |
|
05-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 5903270 play interface, events, markers, etc."
|
| a81ac67d31590942f5a3a8233cf9759c20a494dc |
|
29-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5903270 play interface, events, markers, etc.
As the media framework does not directly support marker and periodic
callbacks, we use a retriggerable one-shot timer at application level
to emulate this. This has the advantage of being faster, but is also
less accurate than if it were in the framework.
Details:
- Get position is now synchronous and (mostly) lock-free
- Fix regression in SL_PLAYEVENT_HEADATMARKER and SL_PLAYEVENTHEADATNEWPOS
- Fix SMP races in GetPlayState, GetCallbackEventsMask, GetMarkerPosition,
GetPositionUpdatePeriod
- AudioSfDecoder was not updating mPositionMsec when getPositionUsec failed
- Updating attributes is relatively expensive, so only do it when a significant change
in SetMarkerPosition, ClearMarkerPosition, SetPositionUpdatePeriod
- Error on unknown message type in onMessageReceived
- Delete an obsolete FIXME
- "Clearing" a marker is now equivalent to disabling the marker event,
and the default marker position is cleared.
- use Android time units and types (int32_t, ANDROID_UNKNOWN_TIME, etc.) where appropriate
instead of SLmillisecond and SL_TIME_UNKNOWN
Change-Id: Ib78bafa20d883b8d927364769663837389b6ea1d
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 0b02ad8c6715ac9d8526e4229a6030ef436704bc |
|
03-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5110581 SL_PLAYEVENT_HEADATEND while looping
Change-Id: Ia4d0433b4a6589bfda2f88addbe5b7eb3d0d9789
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 37b926ac68d4516d07ae485c49057aab5d366340 |
|
02-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 5080320 MediaPlayer volume"
|
| 0afa0fdcde5876941eaefaacc778984ec4efefa0 |
|
28-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5080320 MediaPlayer volume
Details:
- re-factor volume-related code yet again
- remove dead variables mAmplFromVolLevel, mAmplFromStereoPos, mDirectLevel
- add placeholders for kEventPrefetchFillLevelUpdate and kEventPrefetchStatusChange
Known issues:
- MPEG-2 TS doesn't yet implement the ability to query channel count, so default to stereo
Change-Id: Ic0f2297b267dc3d380755e8d314e1d5f0f659d7c
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 5ec63c4998f9b1d8c30363f21cbecc7ffc5d152a |
|
26-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5081346 fix whole file looping
Change-Id: If4e233f9007d7e48225a342a43f06df7f66cdea7
/system/media/wilhelm/src/android/android_GenericPlayer.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/android_GenericPlayer.h
|
| 41562990ca46e5d6c4aadde6c2469b8007bb980c |
|
22-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5045590 preset reverb on audio players
Aux effects on MediaPlayer audio players (non-AudioTrack) were broken
Change-Id: I5b97bee08d809b12cb9815d6d277934123780581
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| e1c913c670ee6f38940555b4247bc4a572eaa798 |
|
21-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5047695 Handle unsuccessful prepare up to app
Change-Id: I9f1541b37ad5cda21dc49388e42c7fb08b22fc5b
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 1b3d049fdaa0dfb601e5b7f482e04e84d38d2f93 |
|
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
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 463a7641944e4a3613f5d76aa8450070ef56b9ff |
|
07-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Rename ANDROID_UNKNOWN_* to UNKNOWN_*
Change-Id: I0d92b7d943690d9af7e08c400471f8b474728bff
/system/media/wilhelm/src/android/android_GenericPlayer.h
|
| 1209c173a13a62d0f7d9f1d605e3665a5818fa90 |
|
28-Jun-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix issues in GenericPlayer destruction
Added a preDestroy() mechanism for the subclasses of
GenericPlayer.
Added a lock around the update and use of the callback
GenericPlayer is using for notifications to the
OpenSL ES framework. This prevents notifications after
the GenericPlayer is flagged for destruction.
Added a lock to protect the update of the audio source
running state, so it doesn't get used after the
AudioSfDecoder is flagged for destruction.
Before stopping the audio source of an AudioSfDecoder
object, release the code buffer if necessary, to
ensure proper teardown of the audio source (OMXCodec)
Change-Id: I6cf08d169a6da622552dda5101dbc61e663ce6aa
/system/media/wilhelm/src/android/android_GenericPlayer.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/android_GenericPlayer.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/android_GenericPlayer.h
|
| fcc996296bdbf6c3949ad4312991fdde4ae2e157 |
|
09-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 Implement streamInformation and volume in OpenMAX AL
- Implement StreamInformation for video size notification.
- Implement the XAVolumeItf for volume control
- Fix bug in GUID -> MPH hash.
- Fixed typo in GenericPlayer::pause() log
- Do not signal a discontinuity automatically when the ABQ is
cleared because clearing the queue doesn't imply there will
be a discontinuity in the data (e.g. the same data that was
cleared could be reenqueued)
- In "native-media" test app: add test code to exercise the
XAVolumeItf functionality.
Change-Id: I9f69f8cacbdce51b6d96d60141ec1d0f645df991
/system/media/wilhelm/src/android/android_GenericPlayer.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/android_GenericPlayer.h
|
| dff1b1fc1f687c544e19df56bef225c45f7256a9 |
|
01-Feb-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
OpenSL ES: support decode to PCM buffer queue
Created a new audio player class, APlayer, from which we derive
subclasses to encapsulate OpenSL ES AudioPlayer implementations:
- ASfPlayer derives from APlayer and encapsulates StageFright
functionality for audio decoding to a buffer
- ADecoder derives from ASfPlayer and encapsulates rendering
the decoded audio data to a callback function. It interfaces
with the OpenSL ES Buffer Queue interface to pass the decoded
data back to an OpenSL ES application.
For OpenSL ES, to support decoding to a Buffer Queue, we now
allow an AudioPlayer to have its sink be a PCM buffer queue.
Change-Id: I9aefeb0375a71f7ca770c5c62b4fb8faf59c9c23
/system/media/wilhelm/src/android/android_GenericPlayer.h
|