summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * CameraHal: Use max zoom value from capabilitiesIvan Evlogiev2012-07-253-10/+13
| | | | | | | | | | | | | | | | | | | | | | Maximum zoom value for stereo is different from the one in mono. Ducati returns maximum possible zoom possition in the capabilities. And this exact possition is used as camera adapter maximum zoom value Change-Id: I23ac8f657b69ad28038ed68286ee0a51f9ffc6b8 Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* | Camera_test: Supported parameters update for 3DDejan Ivanovski2012-07-254-130/+413
|/ | | | | | | Get supported parameters from capabilities for stereo mode Change-Id: Ifc2c3e70df55639e12b27ce4f312ae8e8eab483e Signed-off-by: Dejan Ivanovski <x0162121@ti.com>
* Camera_test:Get supported parameters from capabilitiesDimitar Borisov2012-07-253-555/+1168
| | | | | Change-Id: Idc87a3c25bda059e17481d1f1f43be239bb17b78 Signed-off-by: Dimitar Borisov <x0152684@ti.com>
* CameraHal: Add key for 3d subsampled resolutionsIvan Evlogiev2012-07-256-16/+64
| | | | | | | | | | | Supported subsampled resolutions are communicated through new keys fpr preview and capture. Google standart keys for supported preview sizes are filled for preview and capture based on current selected layout Change-Id: I787e411f35103723b4085e297c3dfaf421f10b2a Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* CameraHal: Various fixes for issues seen during monkey testsEmilian Peev2012-07-259-131/+125
| | | | | | | | | | - 'mParams' in 'OMXCameraAdapter' should not be used for storing/retrieving internal adapter states or data. This object is continuously updated during every 'setParameters()' call and any references related to it can be invalided. Change-Id: I96a590b56fc9567b0c5dfd56cc0d9d8dc78bcab1 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* CameraHal: Enable ancillary data for all buffersIvan Evlogiev2012-07-251-15/+14
| | | | | | | | | Enable ancillary data before preview start in order to fill properly ancillary data even for the very first few buffers Change-Id: I439bb80fd3c1f4c6aa783bc766a991acb87dab10 Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* CameraHal: Search extra data only in the bufferIvan Evlogiev2012-07-254-19/+20
| | | | | | | | | Bug fix for searching extradata types beyond end of the buffer. Check is added for remaning extra data size before accessing the next element. Change-Id: Ic21501fb447080ed9fad7ecad34ce016e9555df1 Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* CameraHAL: Fix manual convergence handlingIvan Evlogiev2012-07-256-60/+111
| | | | | | | | | | Manual convergence is also valid for auto modes. It needs to be applied for all convergence modes. Default manual needs to be 0. Otherwize correction will be applied on ducati side Change-Id: I0b40942dc680b6046c22f5176e4cc7806b2f3f27 Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* CameraHAL: Add picture encoding format selectionPavel Nedev2012-07-259-83/+117
| | | | | | | | Add image port encoding format selection. The supported formats are taken from the camera capabilities. Change-Id: I44d327410e2d669d57532d4c183b09030d598508 Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* CameraHAL: Manual exposure and gain addedPavel Nedev2012-07-259-46/+311
| | | | | | | | Added supported min/max + step values for manual gain and exposure. Added manual gain and exposure params and settings. Change-Id: I15cac8b3fb4dbe0db46bb7fcf7d64805ad4a6db1 Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* Camera_test: Test metering areas center and averageDimitar Borisov2012-07-253-7/+23
| | | | | Change-Id: If9079d12d924ff986d56ede7f880aac3b770e780 Signed-off-by: Dimitar Borisov <x0152684@ti.com>
* Merge "CameraHal: Fix for black lines on the preview" into p-ics-mr1Jean Johnson2012-07-2515-161/+226
|\ | | | | | | Change-Id: I89a49e97ffcf65c992945eeea86b7e6b6b09c45c
| * CameraHal: Adds support for GBCE/GLBCE in OMX CapabilitiesEmilian Peev2012-07-259-31/+101
| | | | | | | | | | Change-Id: I3469f234647316be4d2bb7c32a7ea23e66af996f Signed-off-by: Emilian Peev <epeev@mm-sol.com>
| * Merge "CameraHal: Return AF status immediately during fixed modes" into ↵Jean Johnson2012-07-251-0/+8
| |\ | | | | | | | | | p-ics-mr1
| | * CameraHal: Return AF status immediately during fixed modesEmilian Peev2012-07-251-0/+8
| | | | | | | | | | | | | | | Change-Id: If7986340fb0e33fc388a0c9eeb6f293dcc2d2682 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
| * | CameraHal: Avoids cases leading to error messages during camera setupEmilian Peev2012-07-253-45/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The preview port resolution and sensor overclocking should be set depending on various parameters. For instance switching between different sensor rotations requires to temporarly configure the preview port to a resolution, which doesn't go beyond what the camera supports. Additionally when disabling sensor overclocking, the port parameters should be set first. This again is required in order not go beyond the sensor limitations. Signed-off-by: Emilian Peev <epeev@mm-sol.com> Change-Id: Ie37f6bcdf405b11bcc156ef128436db591dbde55
| * | Merge "Changes related to test focus area and test metering area" into p-ics-mr1Jean Johnson2012-07-251-2/+2
| |\ \
| | * | Changes related to test focus area and test metering areaDimitar Borisov2012-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There are two areas added. - The first one is with higher priority - left down corner. - The second one is with lower priority - right down corner. - The size of the arrays is a square with 1/4 of x coordinate and 1/4 of y coordinate of the preview. Change-Id: I66fac11c89189a2ffae727f83887c02b25fbeaa7 Signed-off-by: Dimitar Borisov <x0152684@ti.com>
| * | | CameraHAL: Fixed crash while resizing NV12 frameDaniel Levin2012-07-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing video snapshot NV12 frame is resizing for thumbnail using external NV12_resize library. Missing initialization of structConvImage.uOffset field was causing random crashes accessing source frame data in VT_resizeFrame_Video_opt2_lp() function. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I4fda98ba1c24cf54c7d90bffe074105a292096f6
| * | | CameraHAL: Fixed checking for valid KEY_VNFDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for http://review.omapzoom.org/17824 Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I03ba1d93ef935bd0f93e5b9443749a14225772a3
| * | | CameraHAL: Fixed setting default flash modeDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed attempt to assign flash mode to OMX_SCENEMODETYPE OMX_Manual value when flash mode is not found in LUT. By default flash mode set to OMX_IMAGE_FlashControlAuto. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I03ee503024ca60f3e4c36468b8bc4336e9165fca
| * | | CameraHAL: Removed unused frame functionsDaniel Levin2012-07-252-73/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed sendFrame() and initCameraFrame() from OMXCameraAdapter. Dead code cleanup. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I6f76e5a6654e76e1bbb0d5c58d49af83aceec408
| * | | CameraHAL: Fixed sending video frame in non metadata modeDaniel Levin2012-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed attempt to reassign camera_memory_t data pointer instead of copy buffer handle value into it. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: Idd3f0d2eda2ba1814261891643b395979c5b2f76
| * | | CameraHAL: Fixed unlocking recording mutexDaniel Levin2012-07-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that mRecordingLock will be unlocked while handling VIDEO_FRAME_SYNC frame. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I5d44c1f0fc654889145ecc93545779de1c2d6d78
| * | | CameraHAL: Fixed inserting EXIF thumbnailDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ReplaceThumbnailFromBuffer() will return 1 on success and 0 on failure. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: Ib082f5f8128aff5b7aced149b21574e93bc95713
| * | | CameraHAL: Fixed deadlock because of mStateSwitchLockDaniel Levin2012-07-252-2/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When OMXCameraAdapter::UseBuffersPreview() is failing mStateSwitchLock must be unlocked. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: Ie9ecccc2e23b0a31b2972beb0411faca279d5d0c
* | | CameraHal: Fix for black lines on the previewDimitar Borisov2012-07-251-0/+9
|/ / | | | | | | | | | | | | | | | | - Fix for black lines seen on the preview after taking an image while in camcorder mode and returning back to capture mode - Before, capture resolution was send to capture port once we press the capture button - This patch sets the capture resolution to capture port after returning from camcorder to capture mode Change-Id: I7f5ed81139810bc1429ed08d3c285664d573babb Signed-off-by: Dimitar Borisov <x0152684@ti.com>
* | Merge "CameraHAL: Minor fix while setting focus callback" into p-ics-mr1Vicky Martinez-DeFrain2012-07-251-1/+1
|\ \
| * | CameraHAL: Minor fix while setting focus callbackDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | In case component is not in executing state method should return without error and without processing the request. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I9de6bc3bf1b6ffbc048bea5d2fd8373081acd9d5
* | | CameraHAL: Fixed launching Jpeg EncoderDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoder instance should be added to the gEncoderQueue before running the thread. Otherwise Encoder callback has chance to be triggered without gEncoderQueue hash map populated. Signed-off-by: Daniel Levin <dendy@ti.com> Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com> Change-Id: Iabfef2ada3c4bd7e4e26405c75ce0d4a171b9d30
* | | CameraHAL: Fixed accessing deallocated preview memoryDaniel Levin2012-07-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case stop preview is called while current preview callback is active deallocated camera_memory_t handle will be passed to CameraService's preview callback. This patch adds scope to guard preview data callback with mLock mutex, blocking the stop preview body. This is a valid case only for preview frame types by CameraService design, because it contains deadlock protection between stop preview and data callback: 1. In CameraService::Client::stopPreview() there is an explicit call disableMsgType(CAMERA_MSG_PREVIEW_FRAME) before stopping preview in Camera HAL. 2. In CameraService::Client::dataCallback(), dataCallbackTimestamp() and notifyCallback() there is an explicit check for message type: if (!client->lockIfMessageWanted(msgType)) return; All other frame types are still not deadlock-protected and Camera HAL must release internal lock before sending them to CameraService. Signed-off-by: Daniel Levin <dendy@ti.com> Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com> Change-Id: I76658b88a50261efca1eec1ec95bc793457acf13
* | | Merge "CameraHAL: Fixed memory corruption while JPEG encoding" into p-ics-mr1Vicky Martinez-DeFrain2012-07-251-1/+1
|\ \ \
| * | | CameraHAL: Fixed memory corruption while JPEG encodingDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case image frame width is greater than stride/2 the right_crop offset gets negative and conversion to YUV will write outside of allocated memory. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I87532ea02ade3636a752954d09f4a9cbdea5ffc3
* | | | Merge "CameraHAL: Fixed UV pointer calculation for video frames" into p-ics-mr1Vicky Martinez-DeFrain2012-07-251-0/+1
|\ \ \ \
| * | | | CameraHAL: Fixed UV pointer calculation for video framesDaniel Levin2012-07-251-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case video size does not match preview size separate Gralloc buffers will be allocated using ION. NV12 preview frames will be explicitly resized using 3rd party library. This patch fixes calculation of UV pointer used for writing resized NV12 frame into. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I34336afa4c4c2c8af025d7eead73773c27332041
* | | | CameraHAL: Added missing 'break' in sendCommand()Daniel Levin2012-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Levin <dendy@ti.com> Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com> Change-Id: I01925156abb3ca60d5283c80690257081ac9514e
* | | | CameraHAL: Fixed calling UseBuffers for measurementDaniel Levin2012-07-252-2/+2
| |/ / |/| | | | | | | | | | | | | | Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I0cf888d29ffb4e4bdc52cdaa37761269007ec618
* | | CameraHAL: Fixed accessing deallocated OMX_BUFFERHEADERTYPEDaniel Levin2012-07-252-1/+42
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At preview stop step buffers are forced to be flushed from Ducati, so after OMXCameraAdapter::flushBuffers() no OMXCameraAdapterFillBufferDone() callback will be triggered afterward. But because separate thread is used to handle fill buffer done callbacks flushed buffers will be handled with delay. This causes the case when already freed buffer header will be accessed. This patch adds flushing to callbacks thread, waiting until all flushed buffers from Ducati will be processed before exiting the OMXCameraAdapter::flushBuffers() body. This fixes random crashed when looking OMX_OTHER_EXTRADATATYPE in OMX_TI_PLATFORMPRIVATE buffer header section. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I87f9aa3bc4bc02d1e46a4fe2568e063324bc8b79
* | CameraHAL: Calculate UV pointer from YDaniel Levin2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | According to Gralloc DDK changes, from now locking the buffer_handle_t will return only Y pointer initialized, but not UV. In order to access NV12 data directly client app should calculate UV pointer manually. Change-Id: Ic67bdd2a90ab6cb222a8421fcd61ca0703019ea7 Signed-off-by: Daniel Levin <dendy@ti.com>
* | Merge "CameraHAL: Handling some Invalid state operations after stop preview" ↵Jean Johnson2012-07-251-0/+6
|\ \ | | | | | | | | | into p-ics-mr1
| * | CameraHAL: Handling some Invalid state operations after stop previewGeorgi Georgiev2012-07-251-0/+6
| | | | | | | | | | | | Change-Id: I940e315b652ab4e5868f40bd6ad6606745c6f7f7
* | | CameraHal: Return from 'setParameters()' immediately in case of errorEmilian Peev2012-07-251-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | - There is a small chance that the status variable 'ret' might get overwritten inside 'setParameters()' during the process of input parameter validation. Change-Id: Ibec17dc1e82fc4e49135d4e7fa6b46892d846ac5 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* | | CameraHal: Fixes a possible race cond. and subsequent freezeEmilian Peev2012-07-251-2/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The notification thread in 'AppCallbackNotifier' will check for pending messages in 'mEventQ' and call 'notifyEvent()' when data is available. On the other hand 'notifyEvent()' will lock 'mLock' and read the incoming events from 'mEventQ'. It is possible for the client to call 'cancelAutoFocus()' between the check for messages in the notification thread and the lock in 'notifyEvent()' effectively flushing all messages in 'mEventQ'. In this case 'notifyEvent()' will try to read the incoming data block and with it also block 'mLock'. This sequence will cause the camera client to freeze in the following calls as well. Solution is to check 'mEventQ' for pending messages inside 'notifyEvent()' after 'mLock' is acquired and before trying to retrieve any data. Change-Id: I92b5e8e3c2be9bd4985d2ae511eedc7eed957241 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* | CameraHAL: Do not reset mPendingPreviewSettingsSundar Raman2012-07-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | mPendingPreviewSettings is being reset in stopPreview This causes algo settings that were set using a setParameter before preview to be cleared out. Fixes an issue with VNF not being applied Change-Id: Ic0d99580213689abef357fbb104cd7b5b79e1973 Signed-off-by: Sundar Raman <sunds@ti.com>
* | CameraHal: Fixes a corner case with sensor overclockingEmilian Peev2012-07-252-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - An issue with FOV can be observed when sensor overclocking is enabled and then disabled. In most cases when sensor overclocking is active the sensor will use a dedicated sensor mode. If this mode is no longer needed and the client configures a smaller resolution ( but for some reason sensor overclocking is still enabled ), then the sensor will remain in the same mode and as a result cropping might be applied. The issue which this patch resolves is an error returned by the camera when trying to disable sensor overclocking. When this case occurs the preview port resolution will get set before sensor overclocking configured. Signed-off-by: Emilian Peev <epeev@mm-sol.com> Change-Id: Ie9669376d556fef2984f2dc0edc66a8f65563b47
* | Merge changes Idbf55037,I896696f2 into p-ics-mr1Jean Johnson2012-07-252-7/+9
|\ \ | | | | | | | | | | | | | | | * changes: CameraHal: Configure Autoconvergence only in stereo case CameraHal: Small VNF API updates within CameraHal module
| * | CameraHal: Configure Autoconvergence only in stereo caseEmilian Peev2012-07-251-5/+7
| | | | | | | | | | | | | | | Change-Id: Idbf55037728f88bfe3343692f295acb8d2ae5899 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
| * | CameraHal: Small VNF API updates within CameraHal moduleEmilian Peev2012-07-251-2/+2
| |/ | | | | | | | | | | Signed-off-by: Emilian Peev <epeev@mm-sol.com> Change-Id: I896696f22d9fa6bf1b1d0809245f90717cb3fc51
* | CameraHAL : Propogate no memory error to MediaserverPrasanna Kumar M.R2012-07-251-1/+3
|/ | | | | | | | | | | | | During Video Rotation use cases, we encounter TILER Out of memory scenario. This error is not propogated to mediaserver and hence the Memory is not freed. This patch allows us to communiate this error which inturn results in restarting mediaserver and Camera can be reused again. Change-Id: Iea2340f1ab89d0eff73360c6aa59e951d6dcf735 Signed-off-by: Sathya Prakash M R <a0393677@ti.com> Signed-off-by: Prasanna Kumar M R <x0118059@ti.com>
* CameraHal: PPM update, configures 'autoconvergence' only when requiredEmilian Peev2012-07-253-83/+77
| | | | | | | | | | | - Currently 'autoconvergence' is taking up-to 150 ms., when set in executing state. Additionally this parameter is directly configured every time when the camera client invokes 'setParameters()'. This change should skip all of the unneeded OMX calls. Change-Id: Ic92d5938678c912ed2ee17b829139264e319df62 Signed-off-by: Emilian Peev <epeev@mm-sol.com>