summaryrefslogtreecommitdiffstats
path: root/libcamera/SecCamera.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github/ics' into 23072012KalimochoAz2012-07-231-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Android.mk BoardConfigCommon.mk board-info.txt device_base.mk egl.cfg factory-images/generate-factory-images-package.sh kernel overlay/frameworks/base/core/res/res/values/config.xml Change-Id: If153de549a1a3b5145f856de6c55c825d3124a11
| * Modified Libcamera to allow Touch to focusKalimochoAz2012-01-091-3/+0
| | | | | | | | Change-Id: I7f1cdc2ce64d60da97cb7d829f51bb4bb1b07c89
* | libcamera: remove unused fimc_v4l2_s_ext_ctrl functionDima Zavin2012-04-091-20/+0
| | | | | | | | | | Change-Id: I393a30310e2768931be7468f5f6f506d1658d655 Signed-off-by: Dima Zavin <dima@android.com>
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-129/+129
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I03a60758c6dad0d9ecbce42f092a0fe757bd7184
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-051-4/+4
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I6d2e59149c2f007d6ba8f1d2990837a37f712ffe
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-12/+12
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I61ce15c87baa38e1f88857e30b549d513a54b724
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-10/+10
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: If4249034e0a90a502aba69c199173c8ad4af93b3
* | resolved conflicts for merge of 98591897 to masterJames Dong2011-11-221-31/+23
|\ \ | |/ | | | | Change-Id: I98e9ae59b25243c0dd94d42e8066c906e7e6e128
| * libcamera: record GPS coordinates with greater precision.James Dong2011-11-211-31/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record latitude and longitude to 7 decimal places (~5 cm) and altitude to 1 cm. The previous behaviour was to record lat/long to 1 arcsecond (~15 m), which was rounded down, so the potential error was up to ~30 m. Addresses AOSP issue 16626. Original author: Vernon Tang <vt@foilhead.net> Suggested by: Wu-cheng Li Reviewed by: jubeam@samsung.com Change-Id: I031858972b939f82f40c0f7299d8eff48bc4f4c5 related-to-bug: 5550852
* | resolved conflicts for merge of 77143165 to masterSimon Wilson2011-11-151-3/+32
|\ \ | |/ | | | | Change-Id: Ic30c853d7f9898206699c3c0e648a54362ed4824
| * Camera: move AF polling code from driver into HALkyoungho.yun2011-11-141-3/+32
| | | | | | | | | | | | | | | | Preview is paused during auto focus. To fix this, move polling code from driver to HAL. Change-Id: Id46d9ccd2aad1a269806f4fddf8ad39c3c87bae9 Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
* | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-106/+106
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I73e1ab4f4eadb55e747b3b2be4b6c1824dce7b2c
* 5PC11X: CAMERA: Fix issue 5032708 - Native crashkyoungho.yun2011-08-111-1/+1
| | | | | | | | | | | Fix Native crash observed in Camera app while taking pictures There are no need to make exif information in encode func. Because we make exif in getExif func. Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com> bug:5032708 Change-Id: I8e07dc6252a4a959a9319eda402f14ff892a5467
* libcamera: Increase memory bufferJeong-Seok Yang2011-06-131-1/+1
| | | | | | | | | | bug fix : libcamera is crashed when capturing picture on back camera sometimes. It is caused by overflow the memory buffer. So, we increase the size of buffer to 5M. Change-Id: If72c06a77e8eaa9544d685c452121eefaa488db1 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* crespo camera: software work-around to enable camcorderIliyan Malchev2011-06-111-18/+0
| | | | | | | | | | | | | | | | | | | | This hack does two things: -- it sets preview to NV21 (YUV420SP) -- it sets gralloc to YV12 The reason being: the samsung encoder understands only yuv420sp, and gralloc does yv12 and rgb565. So what we do is we break up the interleaved UV in separate V and U planes, which makes preview look good, and enabled the encoder as well. FIXME: Samsung needs to enable support for proper yv12 coming out of the camera, and to fix their video encoder to work with yv12. FIXME: It also seems like either Samsung's YUV420SP (NV21) or img's YV12 has the color planes switched. We need to figure which side is doing it wrong and have the respective party fix it. Change-Id: Ib300b560ecce969c68105ad5e2abe88a5e33ae1f Signed-off-by: Iliyan Malchev <malchev@google.com>
* crespo: enable camera (wip)Iliyan Malchev2011-06-071-92/+8
| | | | | Change-Id: I2884f34700cd1cd66f0604378cf12b713263a9d1 Signed-off-by: Iliyan Malchev <malchev@google.com>
* libcamera: Fix setParameters crash when opening front camera.Wu-cheng Li2011-03-071-34/+16
| | | | | | | | | | | bug fix: Duplicated setting of cameraid is caused that setParameters fail. So, operations about setting of camera id are moved for setting once. bug:3512875 Change-Id: I48d0847644525a658b4415fffcf2910a83a65e43 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* Fix the bug that the month of gps timestamp exif is off by 1.Wu-cheng Li2011-02-201-1/+1
| | | | | bug:3468433 Change-Id: Iab4132bdf6515a4fb93e56c2ec31b04ea260f7be
* libcamera: for setting fixed frame rate on only camcording modeJeong-Seok Yang2011-01-271-0/+8
| | | | | | | | | Camera sensor change its frame rate by brightness. It makes video that have too low fps in the dark. So it use fixed frame rate on camcording mode. Change-Id: I293c480ffdc4daed138ad9a11231f16c6c2b2f8b Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* S5PC11X: libcamera: buffer cleanupMike J. Chen2011-01-191-128/+126
| | | | | | | | | | | | | Cleanup how buffers are managed. Before, buffers for preview and capture and record were mixed together, with one thread cleaning up buffers for another. Now, each mode cleans up its own buffers. Implement asychronous buffer release for record case to fix a bug where we allowed FIMC to update a buffer that was still in use by encoder, resulting in encoding a frame that was part one image and part another. Change-Id: I42d0032cea61197a1f3a665a7248b700599d5a6a Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* SP5C11X: libcamera: #ifdef/#defines cleanupMike J. Chen2011-01-191-468/+12
| | | | | | | | | | Remove a bunch of #ifdef conditionals to cleanup the code. The #else cases have generally not been tested for months now and we don't use them, and this makes it easier to follow for the next round of logic cleanup coming up. Change-Id: I4a78901916ed9393ef9b904a1e8037cd645be3b4 Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* libcamera: change shutterspeed units to microsecondsSimon Wilson2010-12-171-1/+2
| | | | | | | This is to avoid shutter speeds less than 1ms from underflowing during the conversion to the denominator portion of 1/1000s. Change-Id: Ib6df304c38dd22a23aa31bc731c95030a089f05e
* 5PC11X: libcamera: move lens to default position when preview startskyoungho.yun2010-12-071-0/+2
| | | | | | | | | | | After taking a picture, the focus is maintained. So if user change from camera mode to video mode after taking a picture very closely to object, focus in video mode is not normal. So move lens to default position when preview starts. Change-Id: I3e41acbb22ad8a754755feae304c287dce690425 Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
* libcamera: add 1900 to tm_year to fix gps dateSimon Wilson2010-11-231-1/+1
| | | | Change-Id: I6b4d1457861dc25b464a530ea308d9a7b86690a7
* libcamera: for reliabilityJeong-Seok Yang2010-11-031-0/+4
| | | | | | | | | | | | | | 1. Adding checking preview status in CameraHardwareSec::stopPreview(). So if its status is not previewing, It doesn't call SecCamera::stopPreview. Thus, buffers what be used by picture thread will not be cleared. 2. Adding killing thread and clear buffers in CameraHardwareSec::cancelPicture() 3. CameraHardwareSec::SplitFrame was modified to remove potential problem about memory access. fix : bug 3093595 Change-Id: Iefa85df297a6abdbb5fb7772b58e0c949aeda0de Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* libcamera: use camera make/model from propertiesSimon Wilson2010-11-021-2/+8
| | | | Change-Id: Ie8dea300c4ee5b9c1cd055301ae26fe44ceef68e
* S5PC11X: libcamera: fix new CTS failures and use of closed fdMike J. Chen2010-10-291-4/+12
| | | | | | | | | | | | | | | | | * put back fps high limit for front camera to 30 because CTS showed it was getting frames faster than the advertised limit of 15. since this is just a range, and user can't request a specific frame rate anyway, there's no harm in advertising that we "might" return faster frame rates. * move stopRecord() in deinit to after m_cam_fd is closed, since it uses it * fix framerate check in setParameter() since now front and back have different default frame rates Change-Id: Id4a3eb35b99890782644a4c4315c637a57ae50bb Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* libcamera: for keeping user settings of vga cameraJeong-Seok Yang2010-10-291-9/+4
| | | | | | | | User settings(i.e. color effects) was not kept when switching camera between VGA camera and 5MP camera. It is fixed. Change-Id: I76dd7cea6902b0adf5f1340deaf02448b41a5e8a Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* Revert "libcamera: for setting fixed frame rate on only camcording mode"James Dong2010-10-291-12/+1
| | | | | | | | This reverts commit a75b35c7a434a8e15015ed29b7168dac8d85dfb8. bug - 3066130 Change-Id: I4d37d5cb0794c2790ec5b1d2848d916640562f95
* S5PC11X: libcamera: threading and error cleanupMike J. Chen2010-10-281-8/+10
| | | | | | | | | | | | | | | | | | | | | Cleanup the way the camera HAL manages its threads so that the exit path should no longer fail in a race condition. The destructor waits for all threads to exit and heaps are destroyed before closing the fd to driver. Remove deadlock case (a HAL interface should not call a callback, because the callback would try to grab a lock that is already being held). Removed mutex usage that wasn't needed (CameraServices already has a mutex). Add checks that could mess up the state of the sensor driver (setting parameters or starting preview when a capture was still in progress). We return errors in these cases instead. Change-Id: I30d832de582a002dad1c087bd7cc7de43237eb19 Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* libcamera: for setting fixed frame rate on only camcording modeJeong-Seok Yang2010-10-291-1/+12
| | | | | | | | | | | Camera sensor change its frame rate by brightness. It makes video that have too low fps in the dark. So it use fixed frame rate on camcording mode. Change-Id: I6ca4cf13e733629c75d244e79443b36b5dba59a5 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com> pid:3640
* libcamera: Fix EXIF informationsJeong-Seok Yang2010-10-281-14/+27
| | | | | | | | | Binary version, ISO, focal-length, and flash informations in EXIF are fixed correctly. Change-Id: I2dbfd217ae1e1bb875848ba89c4633a93d337779 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com> pid:3604
* S5PC11X: libcamera: fix a number of bugs in camera HALMike J. Chen2010-10-251-107/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | * don't save parameters that aren't valid * correct the focal length exif info - should be 3.43mm * update with right focus distance info for front camera * correct thumbnail size in params to match HAL code * fix advertized 1M picture size to match recent driver change * don't generate thumbnails if size set to 0x0 * set right max preview size * don't set scene mode if we don't have any in front camera * update to latest fps ranges in rear sensor (min of 15fps in normal mode, 4fps in night mode) * add support for GPS_TIMESTAMP, GPS_DATESTAMP, GPS_PROCESSING_METHOD * remove gps settings if passed NULL * move recording-size info to internal params * workaround front camera not supporting get_iso and get_shot_time for now * remove antibanding code since we don't support it * ignore invalid jpeg quality settings * reject fps max and min different than our current setting * simplify scene mode settings. driver should have all the right settings already for things like iso, sharpness, saturation, etc. the HAL shouldn't set these separately because that will just confuse and override the sensors own settings. Change-Id: Ib6121cc1ceb650a993661d0ec7498a3472a1dd89 Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* libcamera: for keeping exposure value until capturingJeong-Seok Yang2010-10-251-3/+0
| | | | | | | | | | | Exposure value which setting automatically on auto focusing should be kept until capturing picture or until stopping auto focusing not until finishing auto focusing. Change-Id: Id3e4bacb73325f2f19e871cd22a05843ac59967e Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com> pid:3568
* libcamera: Add EXIF thumbnail on capturing image of front cameraJeong-Seok Yang2010-10-241-3/+11
| | | | | | | Add thumbnail image in EXIF on capturing image of front camera Change-Id: I4f6f4eca5c29f397f793ea6a802997a2d2c65dc7 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* libcamera: for setting quality of JPEG on front cameraJeong-Seok Yang2010-10-241-2/+12
| | | | | | | | | Front camera sensor doesn't support jpeg quality by itself. Because It use H/W JPEG encoder for capturing picture. So, It should be control in HAL. Change-Id: I7f31fae9098b69c3b2ec20891f8b815931bee638 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* libcamera: Add torch mode of flashJeong-Seok Yang2010-10-241-0/+3
| | | | | | | | for supporting torch mode of flash fix: bugs 3064986 Change-Id: I7b5f822c232635640be7156b918b065623e04319 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* S5PC11X: libcamera: Fix CTS issue and update focus distanceMike J. Chen2010-10-201-1/+1
| | | | | | | | | | | | | | Initialize the mSecCamera settings in initDefaultParameters in case setParameter() isn't called by the application (it's not required). Also had to bump the delay in SecCamera::DeinitCamera() or else the next CTS test was not able to start because SecCamera::initCamera would fail to open /dev/video0 because it hadn't been completely released by the previous camera test. Also updated focus distances for back camera with new info from TechWin. Change-Id: Ib84890a466e5f96908a333423e4dcf146a744252 Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* libcamera: Add missing copyrightJeong-Seok Yang2010-10-191-1/+2
| | | | | Change-Id: If70052d910cc904ac29f048ad28bcbb5fa0ddda0 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* SP5C11X: libcamera: Improve start up timeMike J. Chen2010-10-171-167/+87
| | | | | | | | | | | This is part of change to the interface between driver and HAL so that driver doesn't do anything if a setting is the same as current. The HAL part is to send all settings for preview in one ioctl, instead of about a dozen to save even more time (total is about 500ms). Change-Id: I46392e970fd1725719359cdf7fb6ca2006beba4c Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* libcamera: missing cleanup code on desructorJeong-Seok Yang2010-10-141-0/+2
| | | | | Change-Id: Id522b0b386023223bdf19f65431e658417ec0508 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* S5PC11X: CAMERA: Fix libcamera issuesMike J. Chen2010-10-131-41/+45
| | | | | | | | | | | | | | | | | | | | | | | | Remove unofficial parameters so 3rd party apps don't start using them and become incompatible with the offical Google API. Put placeholders for new API KEY_SUPPORTED_PREVIEW_FPS_RANGE and KEY_FOCUS_DISTANCES. Will update when we get info from HW team. Simplify scene settings. Fix a bunch of log messages and reduce unneeded chatter. Fix callback result sent for CAMREA_MSG_FOCUS to be boolean since that's what it's supposed to be. Remove unneeded sleep in cancelAutoFocus. Add FOCUS_MODE_INFINITY support (driver needs to go in first). Change-Id: I10cb8e0f279d3229008fa04771c94bbf9e86d5d8 Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com> id:3180
* libcamera: change orientation of front cameraSimon Wilson2010-10-101-1/+2
| | | | | | | Also add EXIF data for front camera JPEGs, which is required for snapshots to have the correct orientation. Change-Id: I9298df87c0816950779d9a2a9d821dac198c5fd7
* S5PC11X: CAMERA: Add support for 5MP SLSI cameraJeong-Seok Yang2010-10-081-314/+84
| | | | | | | | | | Cleaned up parameters so that we advertise the right features for the front and back cameras. Also remove a lot of unsupported features. Change-Id: I3b2fd77153c7855cccf27733ee87c1379d357be8 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com> Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* libcamera: defensive code for protecting ESDJeong-Seok Yang2010-10-041-0/+34
| | | | | Change-Id: I3333df8437bb54897df8594229ffcc1b23221f7f Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* libcamera: minor bug fix & change some parametersJeong-Seok Yang2010-10-041-11/+10
| | | | | | | | | | 1. Fixed : Camera fail when setting exposure with negative value 2. Change: Added "1280x960" and removed "800x480" in supported resolutions 3. Change: Exposure time is adjusted in EXIF informations. 4. Change: Change flash mode parameter to "on,off,auto" Change-Id: I8cdd2f200780a57e7a324d7f83afc1315b558ce1 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* libcamera: using libs3cjpegJeong-Seok Yang2010-09-241-22/+361
| | | | | Change-Id: I3df95e29de2ccd4cc4643205b6ce6eae6916d32b Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* libcamera: Clean up codeJeong-Seok Yang2010-09-211-2628/+2432
| | | | | | | Removed inconsistent coding style. Aligned better. Change-Id: Ib6fa351cc39ede6881ed4937594689246b87bca8 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>
* libcamera: supporting for front-facing cameraMingyu Kim2010-09-201-21/+18
| | | | | Signed-off-by: Mingyu Kim <mingyu0.kim@samsung.com> Change-Id: I5b55678032bb633103ee596288cd7b7770596b87
* libcamera: do not use libs3cjpegJeong-Seok Yang2010-09-151-284/+7
| | | | | | | | | | | | libs3cjpeg is library about JPEG encoding by H/W IP. But libs3cjpeg is Samsung confidential library. There is some license issues. In addition, Google doesn't want using H/W JPEG encoder. So It was modified for just working some function and building binary. It doesn't work to capture the picture cause problem of jpeg encoding. Change-Id: Ib5e1377d91a536002a2f94206bb3bdfdbc330688 Signed-off-by: Jeong-Seok Yang <jseok.yang@samsung.com>