summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am b5375cf2: am 05ea07df: CameraHal: Use Different Timeout for Video ModeTyler Luu2011-11-171-3/+7
|\ | | | | | | | | * commit 'b5375cf2e7f917556b377be4ec0974f7c62dbe0d': CameraHal: Use Different Timeout for Video Mode
| * am 05ea07df: CameraHal: Use Different Timeout for Video ModeTyler Luu2011-11-161-3/+7
| |\ | | | | | | | | | | | | * commit '05ea07dfe04d915b4288d3e71afbf70f8082fea4': CameraHal: Use Different Timeout for Video Mode
| | * CameraHal: Use Different Timeout for Video ModeTyler Luu2011-11-161-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select AF timeout based on whether or not we are in video mode. b/5492725 Change-Id: I2fa722e6a3a7c149488ddb29ce44262914d19e38 Signed-off-by: Tyler Luu <tluu@ti.com>
* | | am 4da78f38: am 0d086089: am c0cf33c9: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ | |/ / | | | | | | * commit '4da78f389c28bb09044b9b1b05de722feed6c553':
| * | am 0d086089: am c0cf33c9: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ | | |/ | | | | | | * commit '0d086089010a802c7b3eef039fb05d58eddd8330':
| | * am c0cf33c9: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ | | | | | | | | | | | | * commit 'c0cf33c94e3f6c81d622be4062c9ba4c9c51cc4d':
| | | * Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| | | |\ | | | | | | | | | | | | | | | Change-Id: I128ef5f2a43fe5d8b190331492e8e9443ce242bf
* | | | \ am 3f940b7f: am 07a53e09: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | * commit '3f940b7f7d5e0499b76bab2db2af2073c7756e94':
| * | | | am 07a53e09: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | * commit '07a53e0951d12785ca9fa8723be779f0b82c6d51':
| | * | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I32798f1a5d71b996bcf70f957e410f8b8f2c3bee
| | | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-160-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-110-0/+0
| | | | |\ \
* | | | | \ \ am 499aad98: am 53613f8e: am 6014a8f2: When camera.flash_off is 1, disable ↵James Dong2011-11-161-1/+24
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | camera flash. This is for testing purpose only * commit '499aad98956ba1ab16c6bc6540cd19ee1bad189e': When camera.flash_off is 1, disable camera flash. This is for testing purpose only
| * | | | | | am 53613f8e: am 6014a8f2: When camera.flash_off is 1, disable camera flash. ↵James Dong2011-11-161-1/+24
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for testing purpose only * commit '53613f8eaa7150e3042b4b5e786e49dfb06f9ef2': When camera.flash_off is 1, disable camera flash. This is for testing purpose only
| | * | | | | am 6014a8f2: When camera.flash_off is 1, disable camera flash. This is for ↵James Dong2011-11-161-1/+24
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing purpose only * commit '6014a8f2648911e7e0f5ba9256afa1a7a9eaf526': When camera.flash_off is 1, disable camera flash. This is for testing purpose only
| | | * | | | When camera.flash_off is 1, disable camera flash.James Dong2011-11-151-1/+24
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for testing purpose only Change-Id: Idf0a6d5d52daeb4b5ff7576d0119868bdeff40eb related-to-bug: 5617451
* | | | | | am bf97da4d: am a3be7d18: am cb1183d6: videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'bf97da4dfacdb7d8a5555d6aef166d782f6d0e05': videosnapshot memory corruption fixes.
| * | | | | am a3be7d18: am cb1183d6: videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'a3be7d1869d579e0c04985757d3df444c975075f': videosnapshot memory corruption fixes.
| | * | | | am cb1183d6: videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'cb1183d6c3c8894fa09ad3ff7952388f6e7bec94': videosnapshot memory corruption fixes.
| | | * | | videosnapshot memory corruption fixes.Akwasi Boateng2011-11-112-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fixes memory corruption of dst buffer in nv21_to_yuv() convertion 2. Free malloced row_tmp buffer 3. Free params string in Appcallback Change-Id: I2179f1158f6e72cca0f7e5c815b1cb576bfa925e Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> related-to-bug: 5601247
* | | | | | am 0b07b86b: am f56f504a: am ac22c209: Revert "CameraHAL: Fix preview not ↵James Dong2011-11-110-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting after surface is abdandoned" * commit '0b07b86b686d6852d7ff6c886942040e58191189': Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
| * | | | | am f56f504a: am ac22c209: Revert "CameraHAL: Fix preview not starting after ↵James Dong2011-11-110-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface is abdandoned" * commit 'f56f504aa30eed3ece65d098e57e2aff7c3eba09': Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
| | * | | | am ac22c209: Revert "CameraHAL: Fix preview not starting after surface is ↵James Dong2011-11-110-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abdandoned" * commit 'ac22c20954a8d7265f9f242e9c5ca739bcd73746': Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
| | | * | | Revert "CameraHAL: Fix preview not starting after surface is abdandoned"James Dong2011-11-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9. we need to revert this change since this leads to a stop ship problem where we can only take a single picture.
* | | | | | am 477533bc: am 7f0c0d4b: am b8bac933: Merge "HWC: Only invalidate on idle ↵Jamie Gennis2011-11-110-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when blending" into ics-mr0 * commit '477533bc2b2031128b4f50612fcec97cec69e275': HWC: Only invalidate on idle when blending
| * | | | | am 7f0c0d4b: am b8bac933: Merge "HWC: Only invalidate on idle when blending" ↵Jamie Gennis2011-11-110-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '7f0c0d4b1a4509046a6405fb1bb3e85ce955b519': HWC: Only invalidate on idle when blending
| | * | | | am b8bac933: Merge "HWC: Only invalidate on idle when blending" into ics-mr0Jamie Gennis2011-11-110-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'b8bac9331c81cd20143cf5add3d9e7832085acd5': HWC: Only invalidate on idle when blending
| | | * | | Merge "HWC: Only invalidate on idle when blending" into ics-mr0Jamie Gennis2011-11-101-9/+27
| | | |\ \ \
| | | | * | | HWC: Only invalidate on idle when blendingJamie Gennis2011-11-091-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e07129502f59f26768895c30dcdb50b01011738
* | | | | | | am c24cc17f: am eb1fc89d: Revert "CameraHAL: Fix preview not starting after ↵James Dong2011-11-111-5/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface is abdandoned" * commit 'c24cc17f3b7483bd0ff31546eae223943bdaf595': Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
| * | | | | | am eb1fc89d: Revert "CameraHAL: Fix preview not starting after surface is ↵James Dong2011-11-111-5/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abdandoned" * commit 'eb1fc89d3ab1704a59861ab27f4ae0b99f3de75b': Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
| | * | | | | Revert "CameraHAL: Fix preview not starting after surface is abdandoned"James Dong2011-11-111-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9. we need to revert this change since this leads to a stop ship problem where we can only take a single picture.
* | | | | | | am 2f9d236b: am b1c5d8ef: HWC: Only invalidate on idle when blendingJamie Gennis2011-11-111-9/+27
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2f9d236b408d1209bc97f1b45951b9e21adef542': HWC: Only invalidate on idle when blending
| * | | | | | am b1c5d8ef: HWC: Only invalidate on idle when blendingJamie Gennis2011-11-111-9/+27
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b1c5d8ef7fc96ef49a1eaef0d81ff35dc4d2e4e7': HWC: Only invalidate on idle when blending
| | * | | | | HWC: Only invalidate on idle when blendingJamie Gennis2011-11-111-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e07129502f59f26768895c30dcdb50b01011738
| | | | | | |
| \ \ \ \ \ \
*-. \ \ \ \ \ \ Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-11-100-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Change-Id: Icbd53fd50d06de35cf5289479785399b24f3041c
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-100-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-090-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-080-0/+0
| | | | |\ \ \ \ \ \
| * | | | \ \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-100-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ am 8a2c7a2d: am 8eedae16: am 50f5c8a3: CameraHal: WA for green thumbnail for ↵Tyler Luu2011-11-101-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video snapshot * commit '8a2c7a2d44408aea33beef1775c7b925211d1aae': CameraHal: WA for green thumbnail for video snapshot
| * | | | | | | | | | | am 8eedae16: am 50f5c8a3: CameraHal: WA for green thumbnail for video snapshotTyler Luu2011-11-101-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8eedae16744011e4c8cf74a9db1083b172f65344': CameraHal: WA for green thumbnail for video snapshot
| | * | | | | | | | | | am 50f5c8a3: CameraHal: WA for green thumbnail for video snapshotTyler Luu2011-11-101-1/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50f5c8a33223364870a21fb84eabe48c806697fd': CameraHal: WA for green thumbnail for video snapshot
| | | * | | | | | | | | CameraHal: WA for green thumbnail for video snapshotTyler Luu2011-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WA for regression introduced with: 'cf0a61f135: CameraHAL: Use Ancillary data to check for snapshot" Video snapshot postview frames are not currently being tagged with the ancillary data. Let this check pass through when in video mode. Change-Id: I9b3aacb902d15f1cd7f993f6664976299fcb0427 Signed-off-by: Tyler Luu <tluu@ti.com>
* | | | | | | | | | | | am 334dd8a9: am c5831812: am cbaa6646: CameraHAL: Fix preview not starting ↵Tyler Luu2011-11-101-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after surface is abdandoned * commit '334dd8a961fcfe53c083b2b8a0e7041065704a7d': CameraHAL: Fix preview not starting after surface is abdandoned
| * | | | | | | | | | | am c5831812: am cbaa6646: CameraHAL: Fix preview not starting after surface ↵Tyler Luu2011-11-101-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is abdandoned * commit 'c58318126fdf0a295987d0d9338f41c80e273431': CameraHAL: Fix preview not starting after surface is abdandoned
| | * | | | | | | | | | am cbaa6646: CameraHAL: Fix preview not starting after surface is abdandonedTyler Luu2011-11-101-4/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbaa66464ff86bddf40e3c8de8db44473ff27de9': CameraHAL: Fix preview not starting after surface is abdandoned
| | | * | | | | | | | | CameraHAL: Fix preview not starting after surface is abdandonedTyler Luu2011-11-101-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 3/3 for b/5593964. (I'm bundling this fix with b/5573610 because it is preview-related, though strictly speaking not part of b/b/5573610. It has been with us since the beginning.) If an application gets backgrounded (HOME key) without stopping preview and releasing camera, preview would previously not restart when application is resumed. ANativeWindowDisplayAdapter would detect that the preview surface was abandoned and stop sending buffers to CameraAdapter. We were previously not doing anything when CameraService called setPreviewWindow when a display adapter was already created. To fix this issue, we need to send the preview window and restart preview. Change-Id: I36089b0046f9861897d32c50b52128a41e2de2a5 Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | | | | | | | | am fef08387: am 7e51020e: am f9df3ee5: CameraHAL: Clear events queue fix, ↵Sundar Raman2011-11-105-6/+50
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear command queue on exit * commit 'fef083876a27ebab9451c0151ce6fbaae0f66ccf': CameraHAL: Clear events queue fix, clear command queue on exit
| * | | | | | | | | | | am 7e51020e: am f9df3ee5: CameraHAL: Clear events queue fix, clear command ↵Sundar Raman2011-11-105-6/+50
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queue on exit * commit '7e51020ef13a0d4a0addd186a9693571633790e2': CameraHAL: Clear events queue fix, clear command queue on exit
generated by cgit v1.1 at 2025-01-10 13:22:56 +0000