summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-0/+8
|\ | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic86e42d5fb8f81fe5c4f58d2e76852829c609760
| * DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-0/+8
| | | | | | | | | | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
* | Revert "cameraservice: Run HAL3 in Non ZSL mode".Sanjeev Garg2016-05-061-1/+1
| | | | | | | | | | | | | | Reverting the Temp change. This reverts commit f300e17bf3451bf821ccc48c45b243c84ebaff7f. Change-Id: Ib11e38eb8edd7523cb6cdb21caa511152ee62e45
* | cameraservice: Run HAL3 in Non ZSL modeAbhishek Kondaveeti2016-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ZSL mode is not working on HAL3 due to camera backend failures. Run HAL3 forcefully in Non zsl mode till the problem in camera backend fixed. This change will be reverted once the backend issue is fixed. CRs-Fixed: 956182 Change-Id: I1dfcda8eb0fe5cd2d9be6cb2e103f5fd84955ecb
* | CameraClient: MTK SupportRicardo Cerqueira2016-04-111-0/+3
| | | | | | | | | | | | | | Return on MTK hardware, the HAL does this internally and duplicating it here causes an infinite loop. Change-Id: I5bdb925ddb49980747b58dfae4543f812cef4c7d
* | libcameraservice: Allow media server to disconnect camera even unlockedWang, Jianfeng XA2016-03-221-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera service may fail to release the camera hardware instance in some use cases. When an application unlocked the camera before disconnect, disconnect from the application will not be accepted. And disconnect from media server will not be accepted also. Then, the camera hardware instance will not be released and a resource leak will be caused. Allow media server to disconnect the camera at all times even if the camera is unlocked. Change-Id: Icd5ed81bed242fa5947aa40ca85e4ca7fa7286e7
* | Merge tag 'android-6.0.1_r17' into HEADJessica Wagantall2016-03-074-1/+13
|\ \ | |/ | | | | | | Android 6.0.1 release 17 Ticket: CYNGNOS-1854
| * Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-224-1/+13
| | | | | | | | | | | | | | | | Camera service dumps should only be initiated through ICameraService::dump. Bug: 26265403 Change-Id: If3ca4718ed74bf33ad8a416192689203029e2803
* | cameraservice: Change the error mapping for ERROR_CAMERA_DEVICE.Sai Kumar Sanagavarapu2016-01-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of API1-HAL3, if HAL reports CAMERA3_MSG_ERROR_DEVICE, it is getting mapped to CAMERA_ERROR_UNKNOWN in the service layer. But this particular error code is not handled properly even in applications like GoogleCamera (Android default camera app). For example if camera deamon gets killed when GoogleCamera is previewing, since its not handling the error properly, preview freeze is seen for long time followed by mediaserver crash if any user interaction happens meanwhile. Ideally, app should close gracefully based on the error received. So, map CAMERA3_MSG_ERROR_DEVICE to CAMERA_ERROR_SERVER_DIED, so that app and mediaserver gets closed gracefully. Change-Id: Idad9d23262e28e85b020b5bacdaad7c77fe16372
* | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-072-6/+6
|\ \ | |/ | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/av into cm-13.0 Android 6.0.1 release 3 Change-Id: I2f2a1fe1b58c828e8341556996211562d6e195ab
| * Camera: Add video recording stop soundChien-Yu Chen2015-10-142-6/+6
| | | | | | | | | | | | | | Add video recording stop sound to match MediaActionSound. Bug: 24745252 Change-Id: I84b69757c7e0a98abfaafcce5f41dd45fd41cf74
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-053-4/+21
|\ \ | |/ | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * Camera: API1 shim: select better default FPS rangeYin-Chia Yeh2015-09-111-2/+2
| | | | | | | | | | Bug: 23992350 Change-Id: Ie86b24d9e5ea753c6dfc2e5526d371b339be96a1
| * CameraService: Notify camera service proxy of device statusEino-Ville Talvala2015-08-212-2/+19
| | | | | | | | | | | | | | | | Send the camera proxy service in system server updates to camera device state: opened/closed/active/idle. Bug: 23393557 Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
* | cameraservice: Resolve message vs start/stop preview racesRicardo Cerqueira2015-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | Move the mutex in start/stopPreview to include the metadata message management. Fast start/stop sequences could (and would) eventually cause the messages to be enabled/disabled out of sequence (or while the camera wasn't ready for it) This is a port of I367bc45729ce2e858fea972f35e881a755c6021a from cm-11 Change-Id: I9a065f951f628d1c550acbac18493b9ad3853d03
* | Camera: Add extensions to CameraClientShuzhen Wang2015-10-062-2/+34
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change includes the following gerrits: # This is a combination of 4 commits. # The first commit's message is: Camera: Enable Histogram feature. Link the histogram enable/disable commands from application to the HAL layer. Change-Id: I510c4e1798285ed1315bfb0d234fa76090659ba2 # This is the 2nd commit message: Camera: Add support for ZSL burst mode. Added ability to set number of snapshots in burst mode. Change-Id: Ie0e7c8c0117b7adc985cfc92df79747ee6a5ea51 # This is the 3rd commit message: CameraService: Adds support for longshot mode - This change introduces additional functionality inside CameraClient for supporting continuous compressed data callbacks. This is needed for 'Burst/Long shot' mode where we could have indefinite number of callbacks after capture is triggered. (cherrypicked from commit e4f502aa7cbe8875e8a1589024cdcf227c228a2b) Change-Id: Ia18ca9bdda7736c679db557e510870115089537a # This is the 4th commit message: CameraClient: Enables meta data notifications. Adds the needed functionality for enabling/disabling metadata messages depending on the camera client commands. Change-Id: I39d632b4742e83df5db5f86b12742aefc2480dfc Cherrypicked from 25bd97f5ec30e7942c3b1fdc96115da6028736f0 Change-Id: Ie930d20c962593e40a0767f9cf7d4385df8e2561
* Camera2Client: handle slower jpeg stream sensorYin-Chia Yeh2015-07-165-18/+154
| | | | | | | | | | | If largest jpeg stream cannot sustain 30 FPS, don't create jpeg stream until takePicture is called and remove it after still capture is done. Also, disable video snapshot for such sensors so video snapshot won't slow down video recording. Bug: 22231605 Change-Id: I2b34d2537c224694ae10f2006b5a46be45a1b1a6
* CameraService: Add consumer name to output stream dumpsysEino-Ville Talvala2015-06-0910-17/+17
| | | | | | | | | | Also switch use of ANativeWindow to Surface, to get to the getConsumerName() method where necessary. Surface can always be cast to ANativeWindow, but not the other way around, so it's a better option anyway. Change-Id: Ie5c2d30821c1a754f9e382699ff50b4b328288b3
* Camera1 API: Support SW encoders for new camera HALsEino-Ville Talvala2015-06-088-44/+127
| | | | | | | | | | | | - Support new set video format/dataspace command in camera service - HALv3: Select gralloc usage flags based on format - HALv1: Pass format command directly to HAL layer - Use format/dataspace command in CameraSource - Switch all API1 recording to use metadata mode - Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer Bug: 13222807 Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
* Camera: API1 shim: notify shutter correctlyYin-Chia Yeh2015-05-194-11/+64
| | | | | | | | | Previous implementation only notifies the callback when we receive full capture result. This implementation notifies the callback once HAL sends capture start callback. Bug: 12530628 Change-Id: Ibf71d532b5cf649514b316e35683c217021698b4
* Camera: API1 shim: Don't tightly apply crop regionEino-Ville Talvala2015-04-302-93/+37
| | | | | | | | | | | | | | | | | | | | | Due to older HAL compatibility, we have been setting a tight crop region that just bounds the current output streams. However, this did not take into account any possible ZSL output stream, so correct application of our stream cropping rules to ZSL results in double-crop scenarios, if the ZSL stream aspect ratio does not match the aspect ratio of the other output streams. Since all current HALs follow the correct stream cropping rules (or at least sufficiently ignore them for ZSL), simplify the cropping substantially - now either calculate the crop region based purely off the active array dimensions and zoom factor, or purely off the preview stream and zoom factor. The former is used for setting the request crop, and the latter is used for converting coordinates for metering regions. Bug: 20316691 Change-Id: I5a0bc2e7c09cf60fbae4220566540ca9e674d652
* DO NOT MERGE: The preview frame data is broken when sending via Binderdaisuke jinno2015-04-281-1/+1
| | | | | | | | | | | [Cause] CallbackProcessor uses always same buffer to send preview data. A buffer is written before it is read by user process. [Solution] Increment buffer index correctly. Change-Id: I87a7e3dc6546448a419c96aa58ace3b7d086bf70
* Merge "camera: Actually pass device errors to client for Camera2Device."Ruben Brunk2015-04-152-0/+36
|\
| * camera: Actually pass device errors to client for Camera2Device.Ruben Brunk2015-04-152-0/+36
| | | | | | | | | | Bug: 19186859 Change-Id: Ib58588dfd99956b719c34e62c596ea604d97edcb
* | Camera2Client: support HAL version 3.3Zhijun He2015-04-071-1/+2
|/ | | | Change-Id: Id018e3ce21b4344d09a877395eb355adba9e8fa2
* Camera: iterate through all encoders for finding max video sizeYin-Chia Yeh2015-03-311-6/+20
| | | | | Bug: 19712132 Change-Id: I5c1fc748fcc756f6665c31951f8af8a37ff4254d
* Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-194-8/+8
|\
| * Camera: plumbing rotation field throughYin-Chia Yeh2015-03-184-8/+8
| | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-192-39/+16
|\ \
| * | camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-182-39/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | - This updates the CameraService to implement client eviction behavior based on process priority. Bug: 19186859 Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
* | | libcameraservice: Stop using IGBC::BufferItemDan Stoza2015-03-125-10/+11
| |/ |/| | | | | | | | | | | | | Switches all uses of IGraphicBufferConsumer::BufferItem (and BufferQueue::BufferItem) to the BufferItem in libgui. Depends on frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9. Change-Id: I187b3a7d05196b6289596afac8fb9a9d4aebff76
* | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-064-5/+10
|/ | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-02-192-4/+4
| | | | Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
* CameraService: intercept Camera moduleYin-Chia Yeh2015-02-034-5/+5
| | | | | | | | Wrap camera module returned from HAL so get_camera_info returns static_camera_characteristics processed by framework, which generates keys added after HAL3.2 is released. Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
* am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests in ↵Chien-Yu Chen2014-12-161-0/+9
|\ | | | | | | | | | | | | stopPreviewL" into lmp-mr1-dev * commit '0fd52ac2929f6ded984cc3a063645d65b5e2006f': Camera2Client: flush requests in stopPreviewL
| * Camera2Client: flush requests in stopPreviewLRuchit Sharma2014-12-151-0/+9
| | | | | | | | | | | | | | | | | | Requests queued in the pipeline have little meaning after the app calls stopPreview(). Flushing will help improve the switch KPI. bug 17340914 Change-Id: I899d69aa3b0fd41f028760290a81013297712fed
* | am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for ↵Eino-Ville Talvala2014-12-081-0/+6
|\ \ | |/ | | | | | | | | | | newer HALs" into lmp-mr1-dev * commit '668b055081bb9d0d61775acf67bb27ce66b214f6': Camera: Add support for SCENE_MODE_HDR for newer HALs
| * Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-devEino-Ville Talvala2014-12-051-0/+6
| |\
| | * Camera: Add support for SCENE_MODE_HDR for newer HALsEino-Ville Talvala2014-12-051-0/+6
| | | | | | | | | | | | | | | Bug: 18640480 Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00
* | | am 07e19019: am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-081-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '07e190190ffddfbc32ecbf0bd9a9679817da232b': camera: fix logging in ZslProcessor to avoid spam
| * | camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
| |/ | | | | | | | | | | | | | | | | | | AF state mismatch while selecting ZSL candidate should not be treated as a warning. This results into undesriable spam in the logs. ALso, using ALOGVV is consistent with how AE state mismatch is handled in ZslProcessor3.cpp Bug: 18634318 Change-Id: Ia9d7f2bb98f784990b1a6f923983c35f622c3791
* | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-2/+4
|\ \ | | | | | | | | | | | | * commit '902dc42d79b075395d484ce1c71f215b199aaa2a': C++11 compatibility.
| * | C++11 compatibility.Dan Albert2014-11-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* | | am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ↵Yin-Chia Yeh2014-11-193-7/+56
|\ \ \ | | |/ | |/| | | | | | | | | | | | | necessary" into lmp-mr1-dev * commit 'cb79b3dbd377b1a3b6da2f58dfa49050400815ae': Camera2Client: remove recording stream if necessary
| * | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
| |\ \
| | * | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
| | | | | | | | | | | | | | | | | | | | Bug: 17495165 Change-Id: I11b763fde8f9448f4bddec3fe6c81581e7699edb
* | | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles ↵Chien-Yu Chen2014-11-173-73/+90
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | properly" into lmp-mr1-dev * commit '771a362de24be025e8283a91be4201d4d1d4b5d8': CameraService: normalize face rectangles properly
| * | | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Use android.scaler.cropRegion reported in the capture result to normalize face rectangles instead of using the one in current capture request. Bug: 11460393 Change-Id: Id21834bf6ae1f7cc106b4dffb98f9f249a75034b
* | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-5/+5
|\ \ \ | | |/ | |/| | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
generated by cgit v1.1 at 2024-05-18 18:20:21 +0000