summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for ↵James Dong2011-01-262-1/+5
|\ | | | | | | | | | | | | timelapse video recording if there are at least two input video frames from camera source." into honeycomb * commit '8bea1d5585822bb62996e789f59c7629dfd9ac50': Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
| * am 7fb232c4: Merge "Make sure that key frame is generated for timelapse ↵James Dong2011-01-262-1/+5
| |\ | | | | | | | | | | | | | | | | | | video recording if there are at least two input video frames from camera source." into honeycomb * commit '7fb232c40cde91d0958be1694db2d97a126b95f9': Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
| | * Make sure that key frame is generated for timelapse video recording if there ↵James Dong2011-01-262-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are at least two input video frames from camera source. This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where o n is the actual number of buffers advertised by the video encoder o time_interval is the interval settings for timelapse video recording specifying the time distance between neighboring input video frames The fix includes two parts: o OMXCodec will not submit all n buffers at one time, but instead submit one input frame at one time if it become available. o Timelapse camera source made available the first two input frames and do not skip them so that the first compressed output frame data can be received regardless the specified time_interval bug - 3367659 Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
* | | am e328d1c0: am a9f27fa6: Merge "Protect notification callback parameters ↵Andreas Huber2011-01-261-4/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | with a mutex." into honeycomb * commit 'e328d1c0bea62f4dc28210dbcab0da40f4449bf2': Protect notification callback parameters with a mutex.
| * | am a9f27fa6: Merge "Protect notification callback parameters with a mutex." ↵Andreas Huber2011-01-261-4/+14
| |\ \ | | |/ | | | | | | | | | | | | | | | into honeycomb * commit 'a9f27fa631ab21d52c75842ccaacc1cbcd75fca0': Protect notification callback parameters with a mutex.
| | * Protect notification callback parameters with a mutex.Andreas Huber2011-01-261-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | This avoids the race condition where notifications are dispatched to a NULL receiver after notifications have been disabled. Change-Id: I6d351ffbee97616e2c35559c132a6c5e6a66948a related-to-bug: 3394139
* | | am 12b2dc90: am b1e0a870: Merge "Fix crashes caused by some input devices." ↵Jeff Brown2011-01-251-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | into honeycomb * commit '12b2dc90883ef4f930a17907acdef3677b0598a5': Fix crashes caused by some input devices.
| * | am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycombJeff Brown2011-01-251-1/+3
| |\ \ | | |/ | | | | | | | | | * commit 'b1e0a870e4099490127bb917bb4fc7a8f48db893': Fix crashes caused by some input devices.
| | * Merge "Fix crashes caused by some input devices." into honeycombJeff Brown2011-01-251-1/+3
| | |\
| | | * Fix crashes caused by some input devices.Jeff Brown2011-01-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The touch screen sometimes reports more than 10 pointers even though that's all we asked for. When this happens, we start dropping events with more than 10 pointers. This confuses applications and causes them to crash. Raised the limit to 16 pointers. Bug: 3331247 The default behavior was to identify all touch devices as touch screens. External devices that are plugged in are more likely to be touch pads not attached to a screen. Changed the default to be a touch pad and renamed some internal constants to avoid confusion. A certain mouse happens to also behave like a touch pad. That caused problems because we would see multiple concurrent traces of motion events coming from the same input device so we would batch them up. Added code to ensure that we don't batch events unless they come from the same *source* in addition to coming from the same *device*. Due to batching or misbehaving drivers, it's possible for the set of pointer ids to be different from what we expect when it comes time to split motion events across windows. As a result, we can generate motion events with 0 pointers. When we try to deliver those events, we cause an error in the InputTransport so we tear down the InputChannel and kill the application. Added code to check out assumption about pointer ids and drop the event gracefully instead. Patched up the tests to take into account the change in default behavior for identifying touch screens and touch pads. Change-Id: Ic364bd4cb4cc6335d4a1213a26d6bdadc7e33505
* | | | am c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata ↵Mike Lockwood2011-01-251-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | retriever after we are done scanning" into honeycomb * commit 'c80daa1b05b8f1d2873df23821ae2c5344e76fb8': StagefrightMediaScanner: Close metadata retriever after we are done scanning
| * | | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after ↵Mike Lockwood2011-01-251-4/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | we are done scanning" into honeycomb * commit 'f10d940413000732f1cd35bcb113c41019c7e3b7': StagefrightMediaScanner: Close metadata retriever after we are done scanning
| | * | StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-251-4/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the mediaserver from leaking a file descriptor after the media scanner runs BUG: 3373546 Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all ↵Chet Haase2011-01-241-0/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | hwaccelerated rendering" into honeycomb * commit '2acb67ec9fe34316231519373f59dfb76c03d57b': Use optimized display lists for all hwaccelerated rendering
| * | am 67005b05: Merge "Use optimized display lists for all hwaccelerated ↵Chet Haase2011-01-241-0/+33
| |\ \ | | |/ | | | | | | | | | | | | | | | rendering" into honeycomb * commit '67005b05cc76a38a5b3bf6e83957dd03619e9126': Use optimized display lists for all hwaccelerated rendering
| | * Use optimized display lists for all hwaccelerated renderingChet Haase2011-01-241-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, display lists were used only if hardware acceleration was enabled for an application (hardwareAccelerated=true) *and* if setDrawingCacheEnabled(true) was called. This change makes the framework use display lists for all views in an application if hardware acceleration is enabled. In addition, display list renderering has been optimized so that any view's recreation of its own display list (which is necessary whenever the visuals of that view change) will not cause any other display list in its parent hierarchy to change. Instead, when there are any visual changes in the hierarchy, only those views which need to have new display list content will recreate their display lists. This optimization works by caching display list references in each parent display list (so the container of some child will refer to its child's display list by a reference to the child's display list). Then when a view needs to recreate its display list, it will do so inside the same display list object. This will cause the content to get refreshed, but not the reference to that content. Then when the view hierarchy is redrawn, it will automatically pick up the new content from the old reference. This optimization will not necessarily improve performance when applications need to update the entire view hierarchy or redraw the entire screen, but it does show significant improvements when redrawing only a portion of the screen, especially when the regions that are not refreshed are complex and time- consuming to redraw. Change-Id: I68d21cac6a224a05703070ec85253220cb001eb4
* | | am 3564d9ea: am 63d64a14: Merge "Properly rotate video that\'s marked as ↵Andreas Huber2011-01-211-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | such and decoded to a surface." into honeycomb * commit '3564d9eada7ae3f40bc4c80272fbbb867f04e018': Properly rotate video that's marked as such and decoded to a surface.
| * | am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded ↵Andreas Huber2011-01-211-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | to a surface." into honeycomb * commit '63d64a14790ae21db31b60747864b4a7565b33c3': Properly rotate video that's marked as such and decoded to a surface.
| | * Properly rotate video that's marked as such and decoded to a surface.Andreas Huber2011-01-211-0/+2
| | | | | | | | | | | | | | | Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c related-to-bug: 3378148
* | | am 9a62d902: am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer ↵Andreas Huber2011-01-211-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | behaviour" into honeycomb * commit '9a62d902ead8f94fa0ce071300e3767bfb976d8b': Some tweaks to HTTP live / nuplayer behaviour
| * | am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into ↵Andreas Huber2011-01-211-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | honeycomb * commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8': Some tweaks to HTTP live / nuplayer behaviour
| | * Some tweaks to HTTP live / nuplayer behaviourAndreas Huber2011-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - play audio-only streams again - workaround for malformed streams that switch PIDs across bandwidths - attempt to pick a different bandwidth stream if the previously chosen one appears to be malformed/unsupported. Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9 related-to-bug: 2368598
* | | am 612d7f3c: am a423d868: Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
|\ \ \ | |/ / | | | | | | | | | * commit '612d7f3c092ec2c4a2ae44cb09d6dfb4e525a659': clean-up unneeded code
| * | am a423d868: Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
| |\ \ | | |/ | | | | | | | | | * commit 'a423d868009b9961597365ce7f190aef23f4b1cc': clean-up unneeded code
| | * Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
| | |\
| | | * clean-up unneeded codeMathias Agopian2011-01-201-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now that we removed the notion of a "inUse" buffer in surfaceflinger a lot of code can be simplified / removed. noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete" is also gone. Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
* | | | am 5f668c6e: am 8b9df978: Merge "Fix getSwitchState." into honeycombJeff Brown2011-01-191-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5f668c6e6bb2515325632691a804a7c8f24ebb09': Fix getSwitchState.
| * | | am 8b9df978: Merge "Fix getSwitchState." into honeycombJeff Brown2011-01-191-0/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '8b9df97826f94e2e871eff734b174a4752b0d5f9': Fix getSwitchState.
| | * | Fix getSwitchState.Jeff Brown2011-01-191-0/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN because SwitchInputMapper::getSources() returns 0 which cannot match any source mask including AINPUT_SOURCE_ANY. As a result initial lid switch detection is broken. This change adds a new source constant AINPUT_SOURCE_SWITCH that indicates that the source has switches. Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
* | | am 1324e3b1: am 4061c9aa: Merge "Fix the presentation video resolution when ↵James Dong2011-01-191-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | it is different from the actual image resolution of the video." into honeycomb * commit '1324e3b1a4246f77d516b37fa98013ffad91268e': Fix the presentation video resolution when it is different from the actual image resolution of the video.
| * | am 4061c9aa: Merge "Fix the presentation video resolution when it is ↵James Dong2011-01-191-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | different from the actual image resolution of the video." into honeycomb * commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18': Fix the presentation video resolution when it is different from the actual image resolution of the video.
| | * Fix the presentation video resolution when it is different from the actual ↵James Dong2011-01-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | image resolution of the video. bug - 3352413 Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
* | | Merge "Add joystick support to framework."Jeff Brown2011-01-171-0/+16
|\ \ \ | |/ / |/| |
| * | Add joystick support to framework.Jeff Brown2011-01-171-0/+16
| | | | | | | | | | | | Change-Id: I95374436708752e1a9cff3f85c5b9bc3e0987961
* | | am 307003a8: Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-172-0/+7
|\ \ \ | | |/ | |/| | | | | | | * commit '307003a844c90458bcfd7398c44bbae734936238': integrate videoeditor preview player.
| * | Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-172-0/+7
| |\ \
| | * | integrate videoeditor preview player.Dharmaray Kundargi2011-01-162-0/+7
| | | | | | | | | | | | | | | | Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
* | | | am cf18c478: Merge "Implement SurfaceTexture frame-available callback." into ↵Jamie Gennis2011-01-161-0/+13
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | honeycomb * commit 'cf18c4788af740773c9b2720a1c4ed5f45454b8e': Implement SurfaceTexture frame-available callback.
| * | Implement SurfaceTexture frame-available callback.Jamie Gennis2011-01-161-0/+13
| |/ | | | | | | | | | | | | | | This change implements the onFrameAvailable callback for the SurfaceTexture java class. It includes the C++ SurfaceTexture code as well as the JNI and Java code to enable the callback. Change-Id: Ifd8b8e7ad46ee70cba6da1c2e96dab8045d1ea30
* | am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into ↵Mathias Agopian2011-01-141-1/+1
|\ \ | |/ | | | | | | | | | | honeycomb * commit 'a7393dd66f0127c8acdd5f8928b0c2d0de602275': Fix error reporting in Surface::cancelBuffer()
| * Merge "Fix error reporting in Surface::cancelBuffer()" into honeycombMathias Agopian2011-01-141-1/+1
| |\
| | * Fix error reporting in Surface::cancelBuffer()Mathias Agopian2011-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | when we validate the surface there, most errors are in fact allowed because it is legal to cancel a buffer after a surface has been destroyed (for instance). in that case make sure to not log error messages as they are very confusing. Change-Id: Iecdfbaf6d9ee5da54d56cd7ea7a0d430c30934b0
* | | am 3defffe0: Merge "Fix remote GraphicBuffer allocation in SurfaceFlinger." ↵Jamie Gennis2011-01-133-8/+89
|\ \ \ | |/ / | | | | | | | | | | | | | | | into honeycomb * commit '3defffe06e6989506698ecdce1be3149a33774c1': Fix remote GraphicBuffer allocation in SurfaceFlinger.
| * | Fix remote GraphicBuffer allocation in SurfaceFlinger.Jamie Gennis2011-01-133-8/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a horrible hack that I did to allow application processes to create GraphicBuffer objects by making a binder call to SurfaceFlinger. This change introduces a new binder interface specifically for doing this, and does it in such a way that SurfaceFlinger will maintain a reference to the buffers until the app is done with them. Change-Id: Icb240397c6c206d7f69124c1497a829f051cb49b
* | | am 21f62b9e: Merge "Add a method enable encryption." into honeycombJason parks2011-01-131-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '21f62b9e461416ae61c8471f7199f104f8fe33de': Add a method enable encryption.
| * | Merge "Add a method enable encryption." into honeycombJason parks2011-01-131-0/+1
| |\ \
| | * | Add a method enable encryption.Jason parks2011-01-121-0/+1
| | |/ | | | | | | | | | | | | | | | This is for testing and needs to be cleaned up. Change-Id: I29958f2a95c7773744e61bbd23a302b752614f87
* | | am 103198a1: Merge "Implement crop & transform for SurfaceTexture." into ↵Jamie Gennis2011-01-121-0/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | honeycomb * commit '103198a10cc22a49270a787d04b8ab484d2ec235': Implement crop & transform for SurfaceTexture.
| * | Merge "Implement crop & transform for SurfaceTexture." into honeycombJamie Gennis2011-01-121-0/+46
| |\ \
| | * | Implement crop & transform for SurfaceTexture.Jamie Gennis2011-01-121-0/+46
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | This change adds support for the setCrop and setTransform methods of the SurfaceTexture C++ class. The crop and transform for the current texture will be accessed by applications as a single texture coordinate transform matrix. Change-Id: I6482bf96f680e5c175364e848936db3908d6c8f8