summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
* Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-158-16/+13
| | | | Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
* Camera2: Fix JPEG quality metadata type, new warnings.Eino-Ville Talvala2013-01-072-15/+24
| | | | | | | | | | | - JPEG quality tag is now a uint8_t, not an int. Update parameter code accordingly. - Fix new warnings about narrowing conversions. Bug: 7944244 Change-Id: Ie081c57c9e9323148614b170b132ffb98c0a0b9f
* Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-185-14/+14
| | | | | | | | | | The C++ class names don't match what the classes do, so rename ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to GLConsumer. Bug 7736700 Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
* Camera2: fix metadata symbolsIgor Murashkin2012-12-034-153/+153
| | | | Change-Id: I59e457824782de26b7b489cd92eb33d48e6ee2d9
* Fix master build.Ben Murdoch2012-11-281-1/+1
| | | | Change-Id: Ia362f74d8cd7df76292473c26c112dffe190c599
* am b8fa1240: am aa9e3e01: Camera: Play shutter sound iff ↵Igor Murashkin2012-11-273-9/+14
|\ | | | | | | | | | | | | enableShutterSound(true) && ShutterCallback !null * commit 'b8fa1240eedeb487a7ee0cf7d60e17bed9b25cf4': Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !null
| * Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !nullIgor Murashkin2012-11-263-9/+14
| | | | | | | | | | Bug: 7564718 Change-Id: Ie7821cdee57966d88af048759578439a3e6ecb2e
* | Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+0
| | | | | | | | | | Bug: 6654403 Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
* | Camera2: Compile with warnings, fix warningsIgor Murashkin2012-10-2614-50/+45
| | | | | | | | Change-Id: I557350abb32b0480f5da7dcecadfbe9edbe53361
* | am 203836b7: am b8d6efba: Camera2: Don\'t hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
|\ \ | |/ | | | | | | * commit '203836b7584ccb7787202578259d27d70a8a3ede': Camera2: Don't hold locks while waiting to sync.
| * Camera2: Don't hold locks while waiting to sync.Eino-Ville Talvala2012-10-241-33/+35
| | | | | | | | | | Bug: 7409877 Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
* | am 9e83f44c: am 6ccc3c34: Merge "Camera2: Increase mode update timeout." ↵Eino-Ville Talvala2012-10-231-1/+1
|\ \ | |/ | | | | | | | | | | into jb-mr1-dev * commit '9e83f44c0b310a72a080c006ebc3c07bdccc7027': Camera2: Increase mode update timeout.
| * Camera2: Increase mode update timeout.Eino-Ville Talvala2012-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | During camera startup, it might take a few hundred milliseconds before requests start to be dequeued by the HAL. Increase the timeout for synchronizing mode changes and triggers so that triggers near startup don't time out. Bug: 6970465 Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
* | am e50ba28a: am 9e760d66: Merge "Camera2: Fix potential deadlock" into ↵Eino-Ville Talvala2012-10-191-7/+11
|\ \ | |/ | | | | | | | | | | jb-mr1-dev * commit 'e50ba28aa1846a7c2a296f122a5675476dacc4a5': Camera2: Fix potential deadlock
| * Camera2: Fix potential deadlockEino-Ville Talvala2012-10-171-7/+11
| | | | | | | | | | | | | | | | | | | | setPreviewWindow was holding a lock during long-lasting HAL calls which may cause deadlock if the HAL calls back into the service during the call. Stop holding the lock during these calls, since it's not essential to do so. Bug: 7320517 Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
* | am ed653a35: am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." ↵Eino-Ville Talvala2012-10-162-2/+9
|\ \ | |/ | | | | | | | | | | into jb-mr1-dev * commit 'ed653a35784969b7d36e8b36bd421e2a54def0de': Camera2: Improve quirks focusing behavior.
| * Camera2: Improve quirks focusing behavior.Eino-Ville Talvala2012-10-162-2/+9
| | | | | | | | | | | | | | | | | | | | | | - When scene mode is set and the AF quirk is in use, don't change AF mode and then cancel when AF cancel is received. Just change mode since that also implies a cancel. - Only trigger quirks switch when a focusing area is set. Bug: 7318812 Change-Id: I28d8755553bd78052e774701210cb94d84ee2046
* | am 74a7bcc0: am 54717320: Camera2: Don\'t touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
|\ \ | |/ | | | | | | * commit '74a7bcc052d9bdd0f555e9be6f5ecaf92c6b22d8': Camera2: Don't touch frame counter on output frames.
| * Camera2: Don't touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
| | | | | | | | | | Bug: 7357069 Change-Id: I9cd0cdcc23959bfecced5f47bb9e8c59c997dade
* | am 522fa119: am d6cc4a62: Camera2: When focus is already locked in CAF mode, ↵Eino-Ville Talvala2012-10-163-4/+41
|\ \ | |/ | | | | | | | | | | do not trigger HAL. * commit '522fa119fe2745cd950b6216ad6b49587372b7b3': Camera2: When focus is already locked in CAF mode, do not trigger HAL.
| * Camera2: When focus is already locked in CAF mode, do not trigger HAL.Eino-Ville Talvala2012-10-163-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | In HAL2 CAF modes, once focus is locked by an AF trigger, additional triggers will not cause AF notifications, since the state will not change again until a cancelAutofocus call. Since the old API still expects to see a notification, short-circuit this at the service and send an immediate success notification. Bug: 7318298 Change-Id: Ib209a24eaf2a35a247d06aea671efe80a33d751e
* | am cb3911d3: am a14be593: Camera2: Don\'t error out of startPreview when ↵Eino-Ville Talvala2012-10-101-4/+7
|\ \ | |/ | | | | | | | | | | already recording. * commit 'cb3911d30c515e06fbea0000af02fa3d09688943': Camera2: Don't error out of startPreview when already recording.
| * Camera2: Don't error out of startPreview when already recording.Eino-Ville Talvala2012-10-101-4/+7
| | | | | | | | | | Bug: 7327474 Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53
* | am f5230955: am 907e5651: Camera2: Don\'t let unlocks happen during recording.Eino-Ville Talvala2012-10-101-2/+6
|\ \ | |/ | | | | | | * commit 'f52309555013e9909b248374f96d22dae29f6454': Camera2: Don't let unlocks happen during recording.
| * Camera2: Don't let unlocks happen during recording.Eino-Ville Talvala2012-10-101-2/+6
| | | | | | | | | | Bug: 7309020 Change-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17
* | am 6f846139: am 55f6c9df: Camera2: Do not set auto-white-balance regions ↵Eino-Ville Talvala2012-10-101-3/+0
|\ \ | |/ | | | | | | | | | | from metering regions. * commit '6f846139d97ad6cccdd2f243ccf3a19036ad12c7': Camera2: Do not set auto-white-balance regions from metering regions.
| * Camera2: Do not set auto-white-balance regions from metering regions.Eino-Ville Talvala2012-10-101-3/+0
| | | | | | | | | | | | | | Per API documentation, metering regions are only for AE, not also for AWB. Bug: 7312720 Change-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e
* | am e44d7f83: am c0379204: Camera: Limit valid caller PIDs for camera clients.Eino-Ville Talvala2012-10-102-20/+11
|\ \ | |/ | | | | | | * commit 'e44d7f83a4d04b90417684d74f18ad8c703b981a': Camera: Limit valid caller PIDs for camera clients.
| * Camera: Limit valid caller PIDs for camera clients.Eino-Ville Talvala2012-10-102-20/+11
| | | | | | | | | | | | | | | | | | Narrow down on PID checks to avoid cases where service can access the camera even though it shouldn't be able to, per API semantics. Bug: 6970469 Change-Id: Ic468a31949c28ef978b6ed48a70e4601c7ced684
* | am 4c7b3129: am 2b0db6ae: Merge "Camera: Clear Hardware device pointer when ↵Eino-Ville Talvala2012-10-101-0/+1
|\ \ | |/ | | | | | | | | | | initialization fails" into jb-mr1-dev * commit '4c7b312964b2430ccc1f99e99092cc870be2a293': Camera: Clear Hardware device pointer when initialization fails
| * Merge "Camera: Clear Hardware device pointer when initialization fails" into ↵Eino-Ville Talvala2012-10-091-0/+1
| |\ | | | | | | | | | jb-mr1-dev
| | * Camera: Clear Hardware device pointer when initialization failsIgor Murashkin2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When disconnecting, don't try to call device functions if the initialization fails since this can lead to internal HAL segfaults. Bug: 7317107 Change-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff
* | | am 754cbdd2: am dca0ac21: Merge "Camera2: Fix uninitialized parameters." ↵Eino-Ville Talvala2012-10-091-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-mr1-dev * commit '754cbdd2dd3376bb2b55d762c2909f816bd768cc': Camera2: Fix uninitialized parameters.
| * | Merge "Camera2: Fix uninitialized parameters." into jb-mr1-devEino-Ville Talvala2012-10-091-0/+8
| |\ \ | | |/ | |/|
| | * Camera2: Fix uninitialized parameters.Eino-Ville Talvala2012-10-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some parameters were not being set to default values, causing strange flakiness in any app that wasn't calling setParameters. This includes many CTS tests. Bug: 6970468 Change-Id: If91635afc000e23862e7b039292a55349274c5ee
* | | am e4664bb0: am 3d84d38e: Merge "Camera2: Call onAutoFocus immediately for ↵Igor Murashkin2012-10-091-0/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | fixed-focus cameras" into jb-mr1-dev * commit 'e4664bb098a9b7d6ae1a93486456eff71eaae1bf': Camera2: Call onAutoFocus immediately for fixed-focus cameras
| * | Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into ↵Igor Murashkin2012-10-091-0/+15
| |\ \ | | | | | | | | | | | | jb-mr1-dev
| | * | Camera2: Call onAutoFocus immediately for fixed-focus camerasIgor Murashkin2012-10-091-0/+15
| | |/ | | | | | | | | | | | | Bug: 7311578 Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee
* | | am 240a538b: am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing ↵Eino-Ville Talvala2012-10-092-5/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | to be later." into jb-mr1-dev * commit '240a538b59b905b68d46e39d79c8d48d1662161c': Camera2: Move non-ZSL shutter sound firing to be later.
| * | Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-devEino-Ville Talvala2012-10-092-5/+12
| |\ \ | | |/ | |/|
| | * Camera2: Move non-ZSL shutter sound firing to be later.Eino-Ville Talvala2012-10-082-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of firing shutter sound when capture request is submitted for non-ZSL captures, fire it when the metadata frame is received. This guarantees that the shutter sound fires after picture capture is completed by the sensor. Bug: 7259900 Change-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3
* | | am 843aba43: am 2458d482: Merge "Camera2: Always disconnect in the client ↵Eino-Ville Talvala2012-10-081-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | destructor" into jb-mr1-dev * commit '843aba43ef85f5a40db03e0f384ed096b03592d0': Camera2: Always disconnect in the client destructor
| * | Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-devEino-Ville Talvala2012-10-081-0/+4
| |\ \ | | |/ | |/|
| | * Camera2: Always disconnect in the client destructorIgor Murashkin2012-10-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Camera2Client failed to initialize, it would skip disconnect step, and thus the camera would be forever marked as busy. By always calling disconnect it will always call free. It also adds a new guarantee that Client::disconnect is idempotent Bug: 7298182 Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5
* | | am 4a4253b9: am 82edd543: Camera2: isSmoothZoomSupported should return FALSEIgor Murashkin2012-10-081-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '4a4253b979586c9de21425f5e3cb34da9f1e57de': Camera2: isSmoothZoomSupported should return FALSE
| * | Camera2: isSmoothZoomSupported should return FALSEIgor Murashkin2012-10-081-1/+1
| |/ | | | | | | | | Bug: 7308024 Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d
* | am 9ea63b3b: am 6f854608: Camera2: Set default flash mode to FLASH_OFFAlex Ray2012-10-081-2/+2
|\ \ | |/ | | | | | | * commit '9ea63b3bfd696bcce9cb28e86218a3449dd699d8': Camera2: Set default flash mode to FLASH_OFF
| * Camera2: Set default flash mode to FLASH_OFFAlex Ray2012-10-081-2/+2
| | | | | | | | | | Bug: 6970090 Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c
* | am a761686d: am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 ↵Igor Murashkin2012-10-081-1/+2
|\ \ | |/ | | | | | | | | | | validation error" into jb-mr1-dev * commit 'a761686d14ff8abd704a4802ca6ea0b801a9a32d': Camera2: Fix Parameters#setZoom off by 1 validation error
| * Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into ↵Igor Murashkin2012-10-081-1/+2
| |\ | | | | | | | | | jb-mr1-dev