a6c69c7e1665b38da8d6784e65210acbe501b92c |
|
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I270cbf7b920d5f2fbb5f345f3c88426697c4391d
/frameworks/wilhelm/src/sles_allinclusive.h
|
682f9be91e641e80739c21d6ff124379a806182a |
|
16-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5238515 AndroidBufferQueue miscellaneous AndroidBufferQueue: - errors found by setItems are now hard errors, and cause Enqueue to return an error result (e.g. PARAMETER_INVALID or PRECONDITIONS_VIOLATED) - disallow EOS with non-zero data - disallow Enqueue after EOS - Enqueue checks MPEG-2 sync byte of first packet to reduce chance of downstream failures - use MPEG-2 terminology "packet" instead of "block" - Clear and init don't need to erase buffer content, as it is inaccessible - put placeholder in IAndroidBufferQueue_SetCallbackEventsMask for additional events beyond SL_ANDROIDBUFFERQUEUEEVENT_PROCESSED - comment unused field mBufferState in AdvancedBufferHeader - fix a minor typo - add dump method, #if 0 out by default Change-Id: I11921e3784bfdb30e2cebaa1dabb705ea5ab0b92
/frameworks/wilhelm/src/sles_allinclusive.h
|
05c7b2d09d54b9260ff7f3f5e491f38d0097c406 |
|
21-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5369977 check required interface compatibility Use required not exposed in checkSourceSinkVsInterfacesCompatibility. Change-Id: Ib71826b989ddef2e87dd60bec0306ca2a4021fe3
/frameworks/wilhelm/src/sles_allinclusive.h
|
01679db9a9318689f17b3ea4f69dbfc66a4a0583 |
|
26-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Move macro definition to more appropriate place When sles_allinclusive.h was split up into separate files, this hunk ended up in the wrong file. sles_allinclusive.h still needs some more re-factoring, but that's a separate issue. Change-Id: Iafa92c6b4d22f79b080db6ddf9078acc4296dd7b
/frameworks/wilhelm/src/sles_allinclusive.h
|
4260ff7b8f65fdfe8d0176cdce66faf0a10c4b10 |
|
10-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5287473 realize locks Realize had inconsistent and partial locking. Now realize runs completely locked by default. Change-Id: If453cfc0ac874f32cf5a1fcfe7795d24bd2a48d4
/frameworks/wilhelm/src/sles_allinclusive.h
|
68c8a1b6deea46eeca57848768a92e96d583aadd |
|
25-Aug-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Metadata keys for PCM decoding Declare in a public header the metadata keys an application which decodes audio data would use to figure out the output PCM format. Make the SL ES Android header also include the configuration and metadata headers. Update test apps to reflect this. Change-Id: I298db4fdb800df2d48047691441aa7489aad4822
/frameworks/wilhelm/src/sles_allinclusive.h
|
ccabcf9073f0ccd12016ff1f05d1c4456c41b254 |
|
16-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Bug 5147281 prefetch status deadlocks"
|
a60dbf554549d10780f473b6e1373aa07aec3a28 |
|
11-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5147281 prefetch status deadlocks Fixed two deadlocks related to AudioTrack prefetch event callbacks: - if PrefetchStatus interface was initialized on an AudioPlayer, there was a deadlock at the point where it checked whether to do a callback - prefetch status callbacks are now called with the object unlocked, so they are permitted to do APIs on the object Miscellaneous fixes: - SMP-safe locks for GetPrefetchStatus, GetFillLevel, GetCallbackEventsMask, SetFillUpdatePeriod, GetFillUpdatePeriod - SetCallbackEventsMask error handling for invalid bitmask - Enqueue sets prefetch fill level to 1000 Change-Id: Ic8b2c440aeb4efa3446a4a73d3422d934ceb0578
/frameworks/wilhelm/src/sles_allinclusive.h
|
bb832e853d4afb11b0a3287b2eb0cad87696d631 |
|
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
/frameworks/wilhelm/src/sles_allinclusive.h
|
c6853892c94800e72c0bd676d5d2136d48cea76e |
|
19-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Use the documented header filenames Both Khronos and we say to use < > in our docs Change-Id: Ibf1d2b83036582a605aa6b9043210c89a4eb0e1e
/frameworks/wilhelm/src/sles_allinclusive.h
|
85133c817f6f387cd7d072988a8818f18bb53702 |
|
12-Jul-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Async callback queue updates, applied to XAStreamInformationItf Updated the asynchronous callback queue system to support 'piipp' callback signatures. Applied this update to make the StreamInformation property change event notification asynchronous. Made the XA_PLAYEVENT_HEADATEND also use the callback queue. Change-Id: I6fd8dee5eefa1d09006661f69de302a8b7fff0f5
/frameworks/wilhelm/src/sles_allinclusive.h
|
377aa54ce344adcbc8bac731c6db9e7e39b432c5 |
|
10-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Defer SL_PLAYEVENT_HEADATEND to avoid deadlock This is a first example, and if it works well then will be implemented for other appropriate callbacks also. Change-Id: Ieeab6b3498c74305e19a9d9c8ff497eff22243aa
/frameworks/wilhelm/src/sles_allinclusive.h
|
1a9c2615d0933d183fcb1b9e34ec8f0da2a85153 |
|
07-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Rename ANDROID_UNKNOWN_* to UNKNOWN_* Change-Id: I0d92b7d943690d9af7e08c400471f8b474728bff
/frameworks/wilhelm/src/sles_allinclusive.h
|
7b726bdcd996f1cab3a584c04ce1afc07bc8fbe7 |
|
07-Apr-2011 |
Glenn Kasten <gkasten@google.com> |
Refactor the handling of updates to attributes Attribute handler functions are more modular and get rid of those endless if statements. Change-Id: I3221aeb3d26d2dcc5dc9a3f6d37d088f5ce511a1
/frameworks/wilhelm/src/sles_allinclusive.h
|
92b245bf8828db9e469febebbe8774c00570b5b9 |
|
07-Apr-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
OpenMAX AL: support the SeekItf and XA_PLAYEVENT_HEADATEND Implemented support for: - seeking to a position - looping (only over full duration is supported, no loop points) - notification of end of content reached This is all for the playback of URIs or FDs. Change-Id: I015c40e66feb7ac280459895f5f7915ac964df31
/frameworks/wilhelm/src/sles_allinclusive.h
|
4ee246c55533bdab8ab5fa0f0581744fe58e7c91 |
|
29-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Move support for SL URI and FD playback under GenericPlayer class The SfPlayer class was implementing URI and FD decode and playback in the application process. This CL removes this class entirely and moves its functionality under the GenericPlayer class. This means that the playback of URIs and FDs is now implemented through an android::MediaPlayer object running in the media service. The SfPlayer header had many StageFright and system includes, which are now moved to the relevant files where they are required, instead of automagically coming from sles_allinclusive.h. Note that this CL breaks support for the following OpenSL ES features due to missing Android MediaPlayer features: SLPlayItf.GetPosition HEADATMARKER HEADATNEWPOSITION SLVolumeItf.EnableStereoPosition SetStereoPosition SLMuteSoloItf SLPlaybackRateItf Support for those features will be reintegrated in subsequent CLs. Change-Id: I8d7f6ea006eb7b876ef1ca1909d74b4517335850
/frameworks/wilhelm/src/sles_allinclusive.h
|
63c002ab68761be0eace98f28320d8eb2f3f7695 |
|
28-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Clean up main header There are many includes in sles_allinclusive.h that should be moved to the files that rely on those headers. This is a first cleanup to move Android audio effect related headers to where they belong. + one relocation for a media server related file. More to come with AudioPlayer refactoring. Change-Id: I181dde96db522d9cfb537dffea18ba57f855b99e
/frameworks/wilhelm/src/sles_allinclusive.h
|
f62044fafa9644468b35ae7291497b0482762f95 |
|
24-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 9e0e6e5c: Fix bug 4109988 fix deadlock on destroy * commit '9e0e6e5c60320dac9aa2abbce2f9a843b8fc4449': Fix bug 4109988 fix deadlock on destroy
|
33b27581efde3ee91652bfec35194b2d54603c7c |
|
22-Mar-2011 |
Carl Shapiro <cshapiro@google.com> |
Include strings.h for the strcasecmp prototype. Change-Id: Ibd1689f36b3d74eb1dc1a506f97ca8d11f2b0730
/frameworks/wilhelm/src/sles_allinclusive.h
|
83ac345e264c1e22b7a2f1a110b2fe92473394ec |
|
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
/frameworks/wilhelm/src/sles_allinclusive.h
|
2de28cc2b424a49a440e1d5893beb07086ab0ad7 |
|
17-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Bug 4106199 Split libOpenSLES.so & libOpenMAXAL.so" into honeycomb-mr1
|
527f8ca99f2938d6569fc25dcf3256985a54dec6 |
|
16-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4106199 Split libOpenSLES.so & libOpenMAXAL.so Change-Id: I718cf6bcfff51a6fb153928eb160a36b4ca9fc96
/frameworks/wilhelm/src/sles_allinclusive.h
|
e9236d046fdb5cac0696c42e03443a2439188146 |
|
16-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 clean logs, PTS should be unsigned - Don't pollute logs. - Save MPEG-2 PTS as an unsigned 64bit value, negative values are invalid. Change-Id: I51d427789dd1e42219a63c68159f2e28628f0448
/frameworks/wilhelm/src/sles_allinclusive.h
|
1c853a41d9d9886e60618a7c878ce3912f46bf3c |
|
15-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 callback mask for TS streaming - declare a "buffer event" item key and the event mask matching the OpenSL ES 1.1 buffer queue event mask - added a buffer state field in AdvancedBufferHeader to keep track of the lifecycle of a buffer in the queue - in StreamPlayer, store a constant to be sent as the item each time a buffer is dequeued because it's been processed - fix bug in playStream test app where after clearing the queue, the data was read to the last dequeued buffer address, rather than at the beginning of the cache. Change-Id: I07141c8a913dfedeb9fde41d80afbce794ab7379
/frameworks/wilhelm/src/sles_allinclusive.h
|
37dc2fccf3f122b79ebd554de209d0a3c94ae161 |
|
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
/frameworks/wilhelm/src/sles_allinclusive.h
|
70c49ae2867094072a4365423417ea452bf82231 |
|
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
/frameworks/wilhelm/src/sles_allinclusive.h
|
d158d31a6bbb06426b71c3d097b7768bc3fb79a3 |
|
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
/frameworks/wilhelm/src/sles_allinclusive.h
|
68d56b8ebaf60184a3aef988e3d2b09ed8b88c05 |
|
24-Feb-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
OpenMAX AL: consolidate MediaPlayer implementations under superclass The OpenMAX AL MediaPlayer object has two implementations: one for playing from URI/FD (LocAVPlayer) and one for playing from AndroidBufferQueue (StreamPlayer). They both inherit from AVPlayer. This CL makes LocAVPlayer and StreamPlayer inherit from GenericMediaPlayer (new name of AVPlayer) which encapsulates the interaction with an android::MediaPlayer instance running in the media server process. Also it makes GenericMediaPlayer inherit from GenericPlayer, the player superclass also used in OpenSL ES. After this CL, the OpenMAX AL and OpenSL ES have a common class hierarchy for their players. Change-Id: I5f6e279fc29b7f6f26c9ed5c83a9455cfda88ff4
/frameworks/wilhelm/src/sles_allinclusive.h
|
13837cf3f7be0eb8b1a9552bd99a89f98c987720 |
|
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
/frameworks/wilhelm/src/sles_allinclusive.h
|
bcc5c7225e3b7a1dbf2e9e830987f69167acf06f |
|
18-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Rename class__ to clazz, this to thiz The JNI naming conventions avoid conflict with C++ reserved words. Change-Id: I93ad6920bf78c0a02ac4b2650a29c9e11252f731
/frameworks/wilhelm/src/sles_allinclusive.h
|
b2aeb0f1009555181dabb944fe05901cb6e6f632 |
|
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
/frameworks/wilhelm/src/sles_allinclusive.h
|
262059f71a68edc5e510427c63f5f1623d3672a8 |
|
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Directory re-organization Change-Id: I8e3f12a22e765d36ddefd87edf204735b25474f6
/frameworks/wilhelm/src/sles_allinclusive.h
|