summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix some issues with RefBase debugging."Mathias Agopian2011-02-243-189/+325
|\
| * Fix some issues with RefBase debugging.Mathias Agopian2011-02-233-189/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First slipt sp<> out of RefBase into StrongPointer.h so it can be reused more easily and to make it clear that it doesn't require RefBase. Note: the rest of the change only affects the system when DEBUG_REFS is enabled. The main problem we fix here is that the owner id associated with each reference could get out of date when a sp<> or wp<> was moved, for instance when they're used in a Vector< >. We fix this issue by calling into RefBase::moveReferences from a template specialization for sp<TYPE> and wp<TYPE> of the type helpers. RefBase::moveReferences() has then a chance to update the owner ids. There is a little bit of trickery to implement this generically in RefBase, where we need to use a templatized functor that can turn a sp<TYPE>* casted to a void* into a RefBase*. Introduced a new debug option DEBUG_REFS_FATAL_SANITY_CHECKS currently set to 0 by default as there seem to be an issue with sp<ANativeWindow> which trips the sanity checks. Change-Id: I4825b21c8ec47d4a0ef35d760760ae0c9cdfbd7f
* | Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"Christopher Tate2011-02-241-1/+1
|\ \
| * | Binder linkage no longer depends on JNI objrefs as persistent tokensChristopher Tate2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two areas that have changed to eliminate the assumption that local jobject references are both canonical and persistent: 1. JavaBBinderHolder no longer holds onto and reuses it parent object reference per se. Since the underlying JavaBBinder object holds a real global ref, this was redundant anyway. Now, for purposes of its transient need to perform JNI operations, it simply uses the current jobject ref(s) passed during method invocation, and no longer attempts to hold these refs beyond the scope of a single invocation. 2. Binder obituaries no longer assume that a jobject reference to a recipient will always compare == as a 32-bit value with any future reference to the same object. The implementation now asks Dalvik whether object references match. Bug 2090115 Change-Id: If62edd554d0a9fbb2d2977b0cbf8ad7cc8e2e68d
* | | Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"Glenn Kasten2011-02-244-1/+76
|\ \ \
| * | | Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-234-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the video sink for an android.media.MediaPlayer. The new API MediaPlayer.setTexture is currently hidden. This includes: - New Java and C++ interfaces - C++ plumbing and implementation (JNI, Binder) - Stagefright AwesomePlayer and NuPlayer use ANativeWindow (either Surface or SurfaceTextureClient) Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
* | | | Merge "Bug 3362814 Fix SMP race in access to mRequestExit"Glenn Kasten2011-02-241-1/+2
|\ \ \ \
| * | | | Bug 3362814 Fix SMP race in access to mRequestExitGlenn Kasten2011-02-231-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Also fix an unlikely SMP race in access to mHoldSelf on entry to _threadLoop. Change-Id: I6cbc0b94739c7dd5e77e8a5ba0da22cdc0b1a4db
* | | | Merge "Add YV12 preview format to camera parameter constants."Wu-cheng Li2011-02-241-2/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add YV12 preview format to camera parameter constants.Wu-cheng Li2011-02-241-2/+1
| | | | | | | | | | | | | | | | | | | | bug:3463624 Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
* | | | Merge "Remove RefBase.h dependency on TextOutput.h"Mathias Agopian2011-02-231-5/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove RefBase.h dependency on TextOutput.hMathias Agopian2011-02-221-5/+6
| | |/ | |/| | | | | | | Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
* | | Merge "Application-managed callback buffer support for raw image"James Dong2011-02-232-14/+21
|\ \ \
| * | | Application-managed callback buffer support for raw imageJames Dong2011-02-222-14/+21
| |/ / | | | | | | | | | | | | | | | bug - 3292153 Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
* | | Merge "- Add method in MediaPlayerService to collect and pull codec usage ↵Gloria Wang2011-02-231-0/+16
|\ \ \ | |/ / |/| | | | | (duration) for the battery app - Collect MediaPlayer decoding usage data"
| * | - Add method in MediaPlayerService to collect and pullGloria Wang2011-02-221-0/+16
| |/ | | | | | | | | | | | | codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
* | Support more MPEG4-LATM audio functionality.Andreas Huber2011-02-221-1/+2
|/ | | | | | | related-to-bug: 3474610 Change-Id: I6dab40e8b465922c62be9ee7f168718822c6caac Now skipping extra header that the spec claimed shouldn't be present in LATM...
* Add new axes for joysticks and mouse wheels.Jeff Brown2011-02-194-41/+68
| | | | | | | | | | | | | | | | | | Added API on InputDevice to query the set of axes available. Added API on KeyEvent and MotionEvent to convert keycodes and axes to symbolic name strings for diagnostic purposes. Added API on KeyEvent to query if a given key code is a gamepad button. Added a new "axis" element to key layout files to specify the mapping between raw absolute axis values and motion axis ids. Expanded the axis bitfield to 64bits to allow for future growth. Modified the Makefile for keyboard prebuilts to run the keymap validation tool during the build. Added layouts for two game controllers. Added default actions for game pad button keys. Added more tests. Fixed a bunch of bugs. Change-Id: I73f9166c3b3c5bcf4970845b58088ad467525525
* Merge "A/V synchronization at the beginning of a recording session"James Dong2011-02-171-3/+3
|\
| * A/V synchronization at the beginning of a recording sessionJames Dong2011-02-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | o do not use edts/elst boxes since these optional boxes are ignored o manipulate the first video/audio frame duration to make sure that the rest of the audio/video is in sync (ideally, we should only manipulate the vidoe frame duration, not the audio) o reduce the initial audio mute/suppression period, which is used to eliminate the "recording" sound. bug - 3405882 and 3362703 Change-Id: Ib0acfb4f3843b365157288951dc122b006299c18
* | Fix a regression with MotionEvent parceling.Jeff Brown2011-02-171-25/+26
|/ | | | | | Also added some more unit tests. Change-Id: I413654294d1a998eec056884e6df5eaa50f3daf4
* Merge "Add support for arbitrary axes in MotionEvents."Jeff Brown2011-02-161-47/+135
|\
| * Add support for arbitrary axes in MotionEvents.Jeff Brown2011-02-151-47/+135
| | | | | | | | | | | | | | | | | | | | | | This change makes it possible to extend the set of axes that are reported in MotionEvents by defining new axis constants. The MotionEvent object is now backed by its C++ counterpart to avoid having to maintain multiple representations of the same data. Change-Id: Ibe93c90d4b390d43c176cce48d558d20869ee608
* | Decouple AudioRecord read and audio encodingJames Dong2011-02-161-6/+18
| | | | | | | | | | | | bug - 3313754 Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
* | Merge "Add AAC extractor"Gloria Wang2011-02-151-0/+1
|\ \ | |/ |/|
| * Add AAC extractorGloria Wang2011-02-151-0/+1
| | | | | | | | Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
* | Make available h263 DSI information from MPEG4ExtractorJames Dong2011-02-111-0/+2
|/ | | | | | bug - 3446863 Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
* am c6c3e77d: am b66b7a2c: Merge "fix [3408713] Dialog window invisible ↵Mathias Agopian2011-02-101-14/+48
|\ | | | | | | | | | | | | sometimes" into honeycomb * commit 'c6c3e77d4d5cd8de3b1a56bdffdfd42774849512': fix [3408713] Dialog window invisible sometimes
| * am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into ↵Mathias Agopian2011-02-101-14/+48
| |\ | | | | | | | | | | | | | | | | | | honeycomb * commit 'b66b7a2c183a1423ea629d4f73ed95f9b87d54b7': fix [3408713] Dialog window invisible sometimes
| | * fix [3408713] Dialog window invisible sometimesMathias Agopian2011-02-091-14/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | weak pointer comparison operators were implemented wrong, they were using the internal "unsafe" pointer. We could end up with two "equal" weak pointer pointing to different objects. this caused KeyedVector keyed by weak pointer to work incorrectly, in turn causing a window that just got added to a list to be immediately removed. Change-Id: Ib191010c39aafa9229109e4211f6c3b2b2f9696d
* | | Bug 3352047 Wrong message when adjusting volumeGlenn Kasten2011-02-102-0/+2
| | | | | | | | | | | | | | | | | | Add hidden AudioManager.getDevicesForStream and output device codes. Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
* | | Reduce blocking time in file writeJames Dong2011-02-091-5/+8
| | | | | | | | | | | | | | | | | | bug - 3418787 Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
* | | Merge "Handle some edge cases when seeking while starting up OMXCodec"Andreas Huber2011-02-081-0/+1
|\ \ \
| * | | Handle some edge cases when seeking while starting up OMXCodecAndreas Huber2011-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were exposed by the new preview-seekframe while paused code. In particular, the codec may have been in state RECONFIGURING when attempting to seek, or we may have initiated flushing of the output port and this may not have completed yet by the time we want to reconfigure the output port. Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b related-to-bug: 3392259
* | | | - Do not use global DrmManagerClientGloria Wang2011-02-072-2/+2
|/ / / | | | | | | | | | | | | | | | | | | - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811 Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
* | | Improvements/fixes to ACodec.Andreas Huber2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure ACodec reverts its state when it's shutdown - Defer "resume" to after handling the OutputPortSettingsChange - If the OMX_EventPortSettingsChanged event comes in while we're flushing, defer it and make sure the output port can be disabled by deleting all buffers not already owned by the component. Change-Id: I1f8cdffa71237b57d4275a48b834647a7b263e8b
* | | am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-033-5/+4
|\ \ \ | |/ / | | | | | | | | | * commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836': Fix issue 3371080
| * | am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-033-5/+4
| |\ \ | | |/ | | | | | | | | | * commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5': Fix issue 3371080
| | * Fix issue 3371080Eric Laurent2011-02-033-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified default volume control logic in AudioService: 1 IN_CALL volume if in video/audio chat 2 NOTIFICATION if notification is playing or was playing less than 5s ago. 3 MUSIC Modified silent mode: - now also affect MUSIC stream type - entering silent mode when VOL- hard key is pressed once while selected stream volume is already at 0 (except for VOICE_CALL stream). - exiting silent mode when pressing VOL+ hard key while in silent mode Play sound FX (audible selections, keyboard clicks) at a fixed volume. Modified audio framework: - isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger) - iStreamActive() now specifies a time window during which the stream is considered active after it actually stopped. Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
* | | Bug 1804058 FLAC extractorGlenn Kasten2011-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: dependent on external/flac for libFLAC Implemented and tested: * FLAC container * mono and stereo * standard sample rates * standard bit depths * sniffer * media scanner * Vorbis comment metadata including album art * random access seeking with "torture test" * web browser integration for audio/flac (not audio/x-flac), but note that most web servers don't correctly report the MIME type Not implemented: * 24-bit to 16-bit dither or noise shaping in AudioFlinger * 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger * replay gain is better done in AudioFlinger * multi-channel, would need AudioFlinger support * Ogg container, does not seem to be very popular yet Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
* | | am 421d94c2: am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to ↵Jamie Gennis2011-02-023-0/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | SurfaceTextureClient." into honeycomb * commit '421d94c20321e1de528416b279bf148baba47b39': Pass the IGraphicBufferAlloc to SurfaceTextureClient.
| * | am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." ↵Jamie Gennis2011-02-023-0/+16
| |\ \ | | |/ | | | | | | | | | | | | | | | into honeycomb * commit 'ecb4b3f02340e21eefabbea78559e85ec7ee0089': Pass the IGraphicBufferAlloc to SurfaceTextureClient.
| | * Pass the IGraphicBufferAlloc to SurfaceTextureClient.Jamie Gennis2011-02-023-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change passes a reference to the IGraphicBufferAlloc binder object to SurfaceTextureClient objects. When STC objects are created they query their associated ISurfaceTexture object for the IGraphicBufferAlloc that the SurfaceTexture uses to allocate buffers. Having the SurfaceTextureClient hold this reference prevents the GraphicBufferAlloc in SurfaceFlinger from freeing the allocated buffers before the SurfaceTextureClient is done with them. Change-Id: Ib8e30e8b37fdd60438cbb4cb7e9174d0ba6d661c related-bug: 3362519
* | | am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry ↵Jamie Gennis2011-01-301-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | changes." into honeycomb * commit '09443aeb6470d66f5bc1938b70d74b3e2f9bbbb9': Reset ANativeWindow crop on buffer geometry changes.
| * | am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." ↵Jamie Gennis2011-01-301-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | into honeycomb * commit '628845056282a0c5b1a212ce5aeeaac092b91ec8': Reset ANativeWindow crop on buffer geometry changes.
| | * Reset ANativeWindow crop on buffer geometry changes.Jamie Gennis2011-01-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the ANativeWindow API and the two implementations to reset the window's crop rectangle to be uncropped when the window's buffer geometry is changed. Bug: 3359604 Change-Id: I64283dc8382ae687787ec0bebe6a5d5b4a0dcd6b
* | | am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output ↵Dianne Hackborn2011-01-291-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | from aapt d" * commit '371de9695508073fbbde8181eb230e99cb045206': Normalize output from aapt d
| * | am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234': Normalize output from aapt d
| | * \ am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'a30063d80c08434ac3c7316f338c6d54110449ab': Normalize output from aapt d
| | | * \ Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| | | |\ \