summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Add two creation flags to OMXCodec::Create()James Dong2010-10-251-0/+5
| | | | | | | o This allows to force to use software codecs or hardware codecs o If request cannot be fullfilled, Create() returns NULL. Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
* resolved conflicts for merge of 965f960e to masterGloria Wang2010-10-255-0/+33
|\ | | | | | | Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
| * resolved conflicts for merge of 9084631d to gingerbread-plus-aospGloria Wang2010-10-255-0/+33
| |\ | | | | | | | | | Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
| | * DRM framework support:Gloria Wang2010-10-255-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
* | | Mirror the camera preview if the camera is front-facing.Wu-cheng Li2010-10-251-0/+12
| | | | | | | | | | | | | | | bug:3095272 Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
* | | am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix ↵Jeff Brown2010-10-241-5/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | bugs identified." into gingerbread Merge commit '2ef36763700eff5679d6012e7f078c57f1a4c465' * commit '2ef36763700eff5679d6012e7f078c57f1a4c465': Add unit tests for native input and fix bugs identified.
| * | am 860c2df4: Merge "Add unit tests for native input and fix bugs ↵Jeff Brown2010-10-241-5/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | identified." into gingerbread Merge commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp * commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f': Add unit tests for native input and fix bugs identified.
| | * | Add unit tests for native input and fix bugs identified.Jeff Brown2010-10-231-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug where we would lose the first touch point when swiping out of the virtual key area. Fixed a bug where we would not send an ACTION_MOVE event in cases where individual pointers went down/up and the remaining pointers actually moved. This is important since many applications do not handle pointer movements during ACTION_POINTER_DOWN or ACTION_POINTER_UP. In the case of ACTION_POINTER_UP the movement was completely lost since all pointers were dispatched using their old location rather than the new location. Improved motion event validation to check for duplicate pointer ids. Added an input source constant that was missing from the NDK api but defined in the framework api. Added a timestamp when reporting added/removed devices in EventHub. Bug: 3070082 Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
* | | | Merge "OMX extension to support storing meta data in video input buffers ↵James Dong2010-10-222-0/+29
|\ \ \ \ | | | | | | | | | | | | | | | during recording"
| * | | | OMX extension to support storing meta data in video input buffers during ↵James Dong2010-10-212-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recording bug - 3042125 Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
* | | | | am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a ↵Dianne Hackborn2010-10-211-0/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native activity" into gingerbread Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295' * commit '86f1b643d10e0b5b17ae01db3b81020db87b3295': Fix issue #3117918: No way to finish a native activity
| * | | | am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" ↵Dianne Hackborn2010-10-211-0/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp * commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc': Fix issue #3117918: No way to finish a native activity
| | * | | Merge "Fix issue #3117918: No way to finish a native activity" into gingerbreadDianne Hackborn2010-10-211-0/+3
| | |\ \ \
| | | * | | Fix issue #3117918: No way to finish a native activityDianne Hackborn2010-10-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
| * | | | | am 0c636055: Merge "Mirror the preview for front-facing cameras. do not ↵Mathias Agopian2010-10-211-0/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge" into gingerbread Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp * commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4': Mirror the preview for front-facing cameras. do not merge
| | * | | | Merge "Mirror the preview for front-facing cameras. do not merge" into ↵Mathias Agopian2010-10-211-0/+12
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | gingerbread
| | | * | | Mirror the preview for front-facing cameras. do not mergeWu-cheng Li2010-10-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V or FLIP_H first. The formula should be changed after overlay is fixed. bug:3059865 Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
* | | | | | am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" ↵James Dong2010-10-211-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99' * commit '8ad6335d2c22900de5b46460473495b5bcea9f99': File writer size estimation improvement
| * | | | am fa7a87fb: Merge "File writer size estimation improvement" into gingerbreadJames Dong2010-10-201-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp * commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26': File writer size estimation improvement
| | * | | File writer size estimation improvementJames Dong2010-10-191-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Do not count the reserved space for moov if the meta data size is small o Do not count the extra 1KB disturbing small file estimation. o Reduce the default minimum reserved space from 4 KB to 3 KB. o Estimate the moov size based on both duration AND file size limit is set and set it to the smaller estimated value. low risk change bug - 3111983 Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
* | | | Revert "Add length-equality test in String operator== checks."Brad Fitzpatrick2010-10-202-6/+2
| | | | | | | | | | | | | | | | This reverts commit e28210d401ae4ed1258b84c9b17a172a757190e8.
* | | | Add length-equality test in String operator== checks.Brad Fitzpatrick2010-10-202-2/+6
| | | | | | | | | | | | | | | | Change-Id: I6ebc6ef85aac4539269f137c1f29f95b9828d4f9
* | | | Add decode-to-ANativeWindow support to Stagefright.Jamie Gennis2010-10-203-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support to Stagefright for doing OMX video decoding directly into buffers dequeued from an ANativeWindow. It does this by registering the dequeued buffers with the OMX component using an Android-specific OMX extension, and then exchanging buffers between the OMX component and the ANativeWindow. Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
* | | | Merge "Make camera source ready for handling meta-data video buffers."James Dong2010-10-191-5/+54
|\ \ \ \
| * | | | Make camera source ready for handling meta-data video buffers.James Dong2010-10-191-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 3042125 Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
* | | | | Camera framework change required for 0-memcpy recordingJames Dong2010-10-192-0/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | bug - 3042125 Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
* | | | Merge "Camera hal change for 0-memcpy in media recording framework"James Dong2010-10-191-51/+76
|\ \ \ \
| * | | | Camera hal change for 0-memcpy in media recording frameworkJames Dong2010-10-191-51/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o document the camera hal to clarify the reviewer's questions. bug - 3042125 Change-Id: I3edf701d084933ee8d1e3b054d222e8c9dfc42a5
* | | | | am f2c40603: am 7689dd49: Merge "Fix bug where home presses were not poking ↵Jeff Brown2010-10-191-5/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user activity." into gingerbread Merge commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e' * commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e': Fix bug where home presses were not poking user activity.
| * | | | am 7689dd49: Merge "Fix bug where home presses were not poking user ↵Jeff Brown2010-10-181-5/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity." into gingerbread Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp * commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5': Fix bug where home presses were not poking user activity.
| | * | | Fix bug where home presses were not poking user activity.Jeff Brown2010-10-181-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now poke user activity twice: once upon dequeueing an event for dispatch and then again just before we dispatch it. The second poke is to compensate for the fact that it can take a few seconds to identify the dispatch target (if the application is responding slowly) but we want to keep the display from going to sleep for X amount of time after the app gets a chance to actually receive the event. This mirrors pre-Gingerbread behavior. Removed some unnecessary code that filters user activity pokes when sending events to KeyGuard. We don't need this because KeyGuard already tells the power manager to disable user activity. Bug: 3101397 Change-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db
* | | | | am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we ↵Andreas Huber2010-10-191-1/+5
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2' * commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2': For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
| * | | am bc96c284: Merge "For thumbnail extraction make sure we instantiate a ↵Andreas Huber2010-10-181-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp * commit 'bc96c2848dadaa844f95e89708d9941f73bbf400': For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
| | * | For thumbnail extraction make sure we instantiate a decoder that allows ↵Andreas Huber2010-10-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. related-to-bug: 3106534 Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
| * | | am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" ↵Jeff Brown2010-10-151-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp * commit 'c1a564b108c511c0bdd699567c245b031930e718': Add support for secure system overlays. (DO NOT MERGE)
| | * | Add support for secure system overlays. (DO NOT MERGE)Jeff Brown2010-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new window type for secure system overlays created by the system itself from non-secure system overlays that might be created by applications that have the system alert permission. Secure views ignore the presence of secure system overlays. Bug: 3098519 Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
* | | | Add support for calibrating touch position.Jeff Brown2010-10-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for tweaking touch screen alignment without having to modify the kernel device driver x/y axis bounds. Change-Id: I6ca43d3c138548f9dfb76aa33150a0c853698fb6
* | | | am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX ↵Andreas Huber2010-10-1810-0/+6937
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | headers formerly included from external/opencore." into gingerbread Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4' * commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4': Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
| * | | am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers ↵Andreas Huber2010-10-1510-0/+6937
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | formerly included from external/opencore." into gingerbread Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp * commit 'ff7a7a455c15077e2b691efa370619f06058f697': Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
| | * | Check-in of a copy of the Khronos OpenMAX headers formerly included from ↵Andreas Huber2010-10-1510-0/+6937
| | | | | | | | | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c related-to-bug: 3101573
* | | | am 5f0cbfce: am c1e7b218: Merge "Improve input device calibration format." ↵Jeff Brown2010-10-161-24/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '5f0cbfcecc4db20f897507c826296b3aac70c592' * commit '5f0cbfcecc4db20f897507c826296b3aac70c592': Improve input device calibration format.
| * | | am c1e7b218: Merge "Improve input device calibration format." into gingerbreadJeff Brown2010-10-151-24/+31
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'c1e7b2182594aa0463c4a738cc8e7eea6777ef50' into gingerbread-plus-aosp * commit 'c1e7b2182594aa0463c4a738cc8e7eea6777ef50': Improve input device calibration format.
| | * | Merge "Improve input device calibration format." into gingerbreadJeff Brown2010-10-151-24/+31
| | |\ \
| | | * | Improve input device calibration format.Jeff Brown2010-10-141-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for calibrating touch size for devices that report size as an area measurement rather than as a width. Fixed some bugs. Bug: 3096045 Change-Id: I30a12e73752883516ed054f8af407204bca45814
* | | | | am dc3ad87c: am 78a76fea: Merge "Revert to using epoll_wait()." into gingerbreadJeff Brown2010-10-161-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36' * commit 'dc3ad87c04348c925aa86863ed6d25f18a8c6c36': Revert to using epoll_wait().
| * | | | am 78a76fea: Merge "Revert to using epoll_wait()." into gingerbreadJeff Brown2010-10-141-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '78a76fea28b8101c1860a2f1115329e3e63abda3' into gingerbread-plus-aosp * commit '78a76fea28b8101c1860a2f1115329e3e63abda3': Revert to using epoll_wait().
| | * | | Merge "Revert to using epoll_wait()." into gingerbreadJeff Brown2010-10-141-4/+4
| | |\ \ \
| | | * | | Revert to using epoll_wait().Jeff Brown2010-10-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change depends on the kernel having been patched to use hrtimers instead of jiffies for scheduling epoll timeouts. Change-Id: I216bc1c4f565e67ebcb3d2ba4280cb615932bb9e
* | | | | | am 7e9a54d4: am d4e03f37: addresses parts of 3096779 and 3097475Mathias Agopian2010-10-161-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8' * commit '7e9a54d460030a871a4f05e61e943c6a694e9ef8': addresses parts of 3096779 and 3097475
| * | | | | am d4e03f37: addresses parts of 3096779 and 3097475Mathias Agopian2010-10-141-0/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd4e03f37423bee383d17f7292753a5f67e497a28' into gingerbread-plus-aosp * commit 'd4e03f37423bee383d17f7292753a5f67e497a28': addresses parts of 3096779 and 3097475