summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* IOMX: work against metadata buffer spoofingLajos Molnar2016-09-271-2/+2
| | | | | | | | | | | | | | | | - Prohibit direct set/getParam/Settings for extensions meant for OMXNodeInstance alone. This disallows enabling metadata mode without the knowledge of OMXNodeInstance. - Do not share metadata mode buffers cross process. - Disallow setting up metadata mode/tunneling/input surface after first sendCommand. - Disallow store-meta for input cross process. - Disallow emptyBuffer for surface input (via IOMX). - Fix checking for input surface. Bug: 29422020 Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e (cherry picked from commit f8a4cb410115045278f534e54b41ac78d6bf6c07)
* DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-232-0/+9
| | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
* Don't use sp<>&Marco Nelissen2016-06-231-1/+1
| | | | | | | because they may end up pointing to NULL after a NULL check was performed. Bug: 28166152 Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe
* Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-releaseZach Jang2016-04-211-1/+60
| | | | Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d
* Fix size check for OMX_IndexParamConsumerUsageBitsMarco Nelissen2016-04-211-4/+0
| | | | | | | | since it doesn't follow the OMX convention. And remove support for the kClientNeedsFrameBuffer flag. Bug: 27207275 Change-Id: Ia2c119e2456ebf9e2f4e1de5104ef9032a212255
* Get service by value instead of referenceMarco Nelissen2016-02-261-1/+1
| | | | | | | to prevent a cleared service binder from being used. Bug: 26040840 Change-Id: Ifb5483c55b172d3553deb80dbe27f2204b86ecdb
* am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am ↵Lajos Molnar2015-10-191-0/+4
|\ | | | | | | | | | | | | f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev * commit '32ba6ec761fc62f7da217281ac5bb598ffed2db8': stagefright: check bounds for MediaCodecList.getCodecInfo
| * am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge ↵Lajos Molnar2015-10-191-0/+4
| |\ | | | | | | | | | | | | | | | | | | "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-dev * commit '0378676b3f12158537a01916e69f6ab51817605f': stagefright: check bounds for MediaCodecList.getCodecInfo
| | * am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: ↵Lajos Molnar2015-10-191-0/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | check bounds for MediaCodecList.getCodecInfo" into lmp-dev * commit '92990810407a2e1101f5db156c1e264887886c82': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | * am e550d213: am f70b69a8: Merge "stagefright: check bounds for ↵Lajos Molnar2015-10-191-0/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodecList.getCodecInfo" into lmp-dev * commit 'e550d21360287c752fd79a67f1962244ee272be1': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | | * stagefright: check bounds for MediaCodecList.getCodecInfoLajos Molnar2015-10-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24445127 Change-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec
| | * | | am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
| | | * | resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
| | | |\ \ | | | | |/ | | | | | | | | | | Change-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487
| | | | * DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3 (cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)
| | * | | am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue ↵Jon Larimer2015-08-201-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev * commit '8910f92aea5791f245da2c69a8c2ad3fb92bb310': do not dequeue from native window after we hit fatal error -- DO NOT MERGE
| | | * | am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we ↵Jon Larimer2015-08-181-0/+1
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | hit fatal error -- DO NOT MERGE" into lmp-dev * commit 'fecbc5da64a992f91f74ef6c67a7e247b0da7777': do not dequeue from native window after we hit fatal error -- DO NOT MERGE
| | | | * do not dequeue from native window after we hit fatal error -- DO NOT MERGEChong Zhang2015-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 22845824 Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141 (cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
* | | | | Merge "libstagefright: don't reclaim codec when there's buffer owned by ↵Ronghua Wu2015-10-131-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev
| * | | | | libstagefright: don't reclaim codec when there's buffer ownedRonghua Wu2015-10-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by client. Notify the client and try to reclaim again in 0.5s. Bug: 23703241 Bug: 23949540 Change-Id: I1afe50c71635645668bfb73ffa0d801765b5ae3c
* | | | | | am cb70fdbe: Merge "OMX: allow only secure codec to remotely call ↵Wei Jia2015-10-061-0/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | allocateBuffer." into mnc-dev * commit 'cb70fdbe9be14002a4303a93f07a13c508c00d89': OMX: allow only secure codec to remotely call allocateBuffer.
| * | | | | OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
* | | | | | AudioSystem: Fix race condition in accessing ioDescriptorsPraveen Chavan2015-10-051-0/+1
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vector mIoDescriptors can be simultaneouly modified and accessed by 2 threads. Acquire a lock while wrapping the ioDescriptor in a sp<> Bug: 24576810 Author: Haynes Mathew George <hgeorge@codeaurora.org> Change-Id: I73c79ef8eca092b500a7ead3a5ebd0bcf75f9920
* | | | | CameraService: Notify camera service proxy of device statusEino-Ville Talvala2015-08-211-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send the camera proxy service in system server updates to camera device state: opened/closed/active/idle. Bug: 23393557 Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
* | | | | Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-171-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add experimental camera session prepare API.Ruben Brunk2015-08-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18949148 Change-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82
* | | | | Merge "do not dequeue from native window after we hit fatal error" into mnc-devChong Zhang2015-08-151-0/+1
|\ \ \ \ \
| * | | | | do not dequeue from native window after we hit fatal errorChong Zhang2015-08-141-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | bug: 22845824 Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141 (cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
* | | | | Camera: Add camera type to ICameraService.getNumberOfCameras.Eino-Ville Talvala2015-08-141-0/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also determine the number of 'normal' cameras present on camera service startup, and ensure that all normal cameras have IDs lower than the 'strange' cameras. Bug: 23194168 Change-Id: I1f7b14825cb52707de698a955f85da1eaa932663
* | | | am 48192b84: am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am ↵Marco Nelissen2015-08-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | d6ea7f65: am f26400c9: Fix crash on malformed id3 * commit '48192b84db39879e7d83a2f4e7023048fb81ee8e': Fix crash on malformed id3
| * | | am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am ↵Marco Nelissen2015-08-071-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | f26400c9: Fix crash on malformed id3 * commit '0625841daae5bb1351034909ce705aab517eea2d': Fix crash on malformed id3
| | * | am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3Marco Nelissen2015-08-071-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '578d5b66fc9f5e36ca0cb19b21771aa85ec131ee': Fix crash on malformed id3
| | | * am d6ea7f65: am f26400c9: Fix crash on malformed id3Marco Nelissen2015-08-071-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'd6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3': Fix crash on malformed id3
| | | | * am f26400c9: Fix crash on malformed id3Marco Nelissen2015-08-071-1/+1
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f26400c9d01a0e2f71690d5ebc644270f098d590': Fix crash on malformed id3
| | | | | * Fix crash on malformed id3Marco Nelissen2015-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22954006 Change-Id: I488cb1e2c69fc7043b6040481b30fa866000515d
| | | | * | am 7acac10a: Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to ↵Robert Shih2015-05-111-0/+45
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detect malformed MPEG4 nal sizes" into klp-dev * commit '7acac10aae34da5ae4d628c5a270e7e3e94f7598': DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | | | | * DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 ↵Lajos Molnar2015-04-251-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nal sizes Bug: 19641538 Change-Id: I5aae3f100846c125decc61eec7cd6563e3f33777
* | | | | | add GRALLOC_USAGE_HW_COMPOSER flag to video usage bitsChong Zhang2015-07-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 22657091 Change-Id: I6a11bc15bba34035ef31c2f4d41196ece60d4ad9
* | | | | | Merge "libmediaplayerservice: propagate caller pid to MediaCodec." into mnc-devRonghua Wu2015-07-221-5/+9
|\ \ \ \ \ \
| * | | | | | libmediaplayerservice: propagate caller pid to MediaCodec.Ronghua Wu2015-07-211-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22630317 Change-Id: I0337d74f4ef04bf96f2de83f33d98d0d7da47c12
* | | | | | | stagefright: remove workaround for BQ not reporting dropped framesLajos Molnar2015-07-201-5/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22234976 Related-bug: 22552826 Change-Id: Ic29b8d8533a4df8c15bcf3a9dab924aa24428304
* | | | | | Merge "fix soft renderer rotation" into mnc-devChong Zhang2015-07-181-0/+1
|\ \ \ \ \ \
| * | | | | | fix soft renderer rotationChong Zhang2015-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 13222807 Change-Id: I6f6f417422d3a18117b594670bb23e3019d449bb
* | | | | | | Merge "mediaresourcemanager: add pid to removeResource method" into mnc-devRonghua Wu2015-07-182-3/+3
|\ \ \ \ \ \ \
| * | | | | | | mediaresourcemanager: add pid to removeResource methodRonghua Wu2015-07-172-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22496209 Change-Id: I73311573e8d1ac15fec668a9ef6e6af7a07a1d30
* | | | | | | Merge "MediaRecorder: enable audio for slow motion recording" into mnc-devChong Zhang2015-07-171-1/+4
|\ \ \ \ \ \ \
| * | | | | | | MediaRecorder: enable audio for slow motion recordingChong Zhang2015-07-171-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22460747 Change-Id: I23f773ecf7b86928a8eacd25a481636e645affbe
* | | | | | | Merge "Camera: Add hidden experimental tearDown method." into mnc-devEino-Ville Talvala2015-07-171-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Camera: Add hidden experimental tearDown method.Eino-Ville Talvala2015-07-161-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18949148 Change-Id: Ie86ec7d1ec3db54e1154563b2339a208a935f849
* | | | | | | stagefright: flush pending video frames for MediaSyncLajos Molnar2015-07-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22234976 Change-Id: Ib63c2286610181968658fb38f5526a489635cf3e
* | | | | | | stagefright: MediaSync: use VideoFrameSchedulerLajos Molnar2015-07-162-5/+111
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move VideoFrameScheduler to libstagefright as part of this change. Bug: 22234976 Change-Id: Ib23fb52399cb700a1dcf789e8486b94a3edf9d95