summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-232-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When zooming during recording, hal callback thread and request update thread run into deadlock due to lock circular dependency. This change release lock during queuebuffer in callback thread to break the dependency. Bug: 9091576 Change-Id: Ia7b3f0ec17573cb32a5696dcde419ca28f42cfb8
* | | | | | | | am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into ↵Ed Heyl2013-05-231-5/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '6947f125f76dde6664779126415d11b3365225da': camera3: Disable ZSL for limited mode camera HALs
| * | | | | | | Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-devEd Heyl2013-05-241-5/+13
| |\ \ \ \ \ \ \
| | * | | | | | | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9111852 Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
* | | | | | | | | am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race ↵Igor Murashkin2013-05-232-12/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition" into jb-mr2-dev * commit 'ca3fb120f5697c05e3ea1a50abe913a9cc4a8d73': camera3: Fix zsl buffers released-while-in-use race condition
| * | | | | | | | Merge "camera3: Fix zsl buffers released-while-in-use race condition" into ↵Igor Murashkin2013-05-232-12/+20
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | / / / / | | |_|_|/ / / / | |/| | | | | | jb-mr2-dev
| | * | | | | | camera3: Fix zsl buffers released-while-in-use race conditionIgor Murashkin2013-05-222-12/+20
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9007356 Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf
* | | | | | | am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other ↵Igor Murashkin2013-05-233-0/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads waiting" into jb-mr2-dev * commit '1f7f83b7a1f2e2d01f808913ef0b869652c08949': Camera3: Make sure new metadata results signal other threads waiting
| * | | | | | Merge "Camera3: Make sure new metadata results signal other threads waiting" ↵Igor Murashkin2013-05-233-0/+39
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into jb-mr2-dev
| | * | | | | Camera3: Make sure new metadata results signal other threads waitingIgor Murashkin2013-05-223-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also adds a lot of logging around shuffling around metadata frames Bug: 9007356 Change-Id: I4285f4f55b4b899ea4928d43062c705619c8248a
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | Change-Id: I93c0800a90b8c82a59e9f2de7d89d78bf8304733
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-230-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | am ed49d7b5: Merge "camera3: Fix recording failure when switching ↵Igor Murashkin2013-05-223-4/+27
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolutions while preview on" into jb-mr2-dev * commit 'ed49d7b57e66cc2520817b345ef9de289d688bd4': camera3: Fix recording failure when switching resolutions while preview on
| * | | | | | Merge "camera3: Fix recording failure when switching resolutions while ↵Igor Murashkin2013-05-223-4/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | preview on" into jb-mr2-dev
| | * | | | | | camera3: Fix recording failure when switching resolutions while preview onIgor Murashkin2013-05-223-4/+27
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9069574 Change-Id: Ife2ae5467f799dbe37e66714b3a6c9a51e1fe328
* | | | | | | am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestampMansoor Aftab2013-05-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c2c874d88df1b4be52f5415de6606785691bba1f': Camera3: Fix Bug minTimestamp is never greater than frame timestamp
| * | | | | | Camera3: Fix Bug minTimestamp is never greater than frame timestampMansoor Aftab2013-05-221-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug in logic since minTimestamp is initialized to -1, and this needs to be updated for the first frame atleast for logic to work correctly for subsequent frames. Bug: 9007356 Change-Id: I70edc4d9f34ff67a141c027c67396dc2ca9e413a Signed-off-by: Igor Murashkin <iam@google.com>
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I2a95a80d2225eb4a27e8bab567f3838b838daf70
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-220-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Avoid a deadlock during EmptyBufferDoneAndreas Huber2013-05-211-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deadlock happens withen in the case where we use an OMX encoder with a GraphicBufferSource. Bug: 8329090 Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45
* | | | | | am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-devJamie Gennis2013-05-211-11/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f21daf4718bbd5662eae843f5a56e039bd34a2f4': Avoid a deadlock during EmptyBufferDone
| * | | | | Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-devJamie Gennis2013-05-211-11/+17
| |\ \ \ \ \
| | * | | | | Avoid a deadlock during EmptyBufferDoneAndreas Huber2013-05-201-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deadlock happens withen in the case where we use an OMX encoder with a GraphicBufferSource. Bug: 8329090 Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45
* | | | | | | am 01831d23: Camera2/3: Increase digital zoom stepsZhijun He2013-05-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '01831d233c84da7f9092e62f143626918a5a747e': Camera2/3: Increase digital zoom steps
| * | | | | | Camera2/3: Increase digital zoom stepsZhijun He2013-05-201-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Digitial zoom number of steps was 30 and a bit rough. Change it to 100 to make smooth zoom smoother. Bug: 9050908 Change-Id: I141bc0335d58cdcd6530c14cbbfe6c4ffb4c6dc6
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-200-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I35dd28838537b7d96b26cf3731e7391af23b4b86
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-190-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I1d5a94ed7749af26f6eb8e5e06443bd83fc63753
| * | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-160-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-175-8/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'e2dfa5a4ea3459b155b4b403b7dafe2116d960d4': update to Fence::waitForever() API change
| * | | | | | Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-175-8/+4
| |\ \ \ \ \ \
| | * | | | | | update to Fence::waitForever() API changeMathias Agopian2013-05-165-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8988871 Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
* | | | | | | | am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd': Adjust timestamp scale
| * | | | | | | Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Adjust timestamp scaleAndy McFadden2013-05-162-4/+4
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferQueue item timestamps are in nanoseconds, MediaCodec buffer timestamps are in microseconds. Adjust. Bug 8988357 Change-Id: Ib12824d7eea0316a14543c756e3a127c0866db6b
* | | | | | | am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6': wifi-display: retry UDP read/write to improve connection robustness
| * | | | | | wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8922753 Change-Id: Ie6d18f03afcb23d11e6f0e63403e8f0d59b70be8
* | | | | | Reconcile with AOSPJean-Baptiste Queru2013-05-160-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"Elliott Hughes2013-05-141-2/+2
| |\ \ \ \ \
| | * | | | | Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONICGlenn Kasten2013-05-141-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of da1a325bc0a1421f4233e62704da4fab8b0acf7b.) Bug: 8895727 Change-Id: I29d5dcf8519600fdd2910345449c66a5c1284646
| * | | | | Merge "Fix overflow of rand in ARTPConnection"Andreas Huber2013-04-241-1/+2
| |\ \ \ \ \
| | * | | | | Fix overflow of rand in ARTPConnectionYajun Zeng2013-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without this fix, (rand()*1000)/RAND_MAX is mainly 0. Change-Id: I48ae940a7b6974b197d81732774c9dcea107bcf1 Signed-off-by: Yajun Zeng <beanz@marvell.com>
| * | | | | | Merge "fix a race condition of MediaPlayerServce::Client::mClient"Andreas Huber2013-04-241-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Fixed the wrong timestamps issue about camera recording"Marco Nelissen2013-04-221-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fixed the wrong timestamps issue about camera recordingJun Tian2013-04-221-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On emulator, the camera video recording crashes randomly. It's caused by wrong timestamp when encoding the video frame. The element of the vector is erased before accessing it. Therefore, when reading the timestamp from the element, the memory of the element has been changed. Change-Id: I9750417fbb9dc4697ccae1e78e286b23925d3764 Signed-off-by: Panfeng Chang <panfengx.chang@intel.com> Signed-off-by: Jun Tian <jun.j.tian@intel.com>
* | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Change-Id: Iec30f1654f196ebae279ebf71648a2cb44fedc4b
| * | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-150-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-140-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-140-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| | | | |\ \ \ \ \ \
generated by cgit v1.1 at 2024-10-27 22:57:12 +0000