OSDN Git Service
Zhijun He [Fri, 24 May 2013 15:34:46 +0000 (08:34 -0700)]
am
6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
* commit '
6f6b31da6097f1d770137ebadac5023dd8b79413':
Camera3: Fix the deadlock during recording pinch zooming
Zhijun He [Fri, 24 May 2013 15:32:48 +0000 (15:32 +0000)]
Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
Ed Heyl [Fri, 24 May 2013 05:17:51 +0000 (22:17 -0700)]
am
6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
* commit '
6947f125f76dde6664779126415d11b3365225da':
camera3: Disable ZSL for limited mode camera HALs
Ed Heyl [Fri, 24 May 2013 05:15:23 +0000 (05:15 +0000)]
Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
Igor Murashkin [Thu, 23 May 2013 23:51:44 +0000 (16:51 -0700)]
camera3: Disable ZSL for limited mode camera HALs
Bug:
9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
Igor Murashkin [Thu, 23 May 2013 20:44:15 +0000 (13:44 -0700)]
am
ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
* commit '
ca3fb120f5697c05e3ea1a50abe913a9cc4a8d73':
camera3: Fix zsl buffers released-while-in-use race condition
Igor Murashkin [Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)]
Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
Zhijun He [Wed, 22 May 2013 21:01:30 +0000 (14:01 -0700)]
Camera3: Fix the deadlock during recording pinch zooming
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
Igor Murashkin [Thu, 23 May 2013 18:01:51 +0000 (11:01 -0700)]
am
1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
* commit '
1f7f83b7a1f2e2d01f808913ef0b869652c08949':
Camera3: Make sure new metadata results signal other threads waiting
Igor Murashkin [Thu, 23 May 2013 17:57:16 +0000 (17:57 +0000)]
Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
The Android Open Source Project [Thu, 23 May 2013 15:05:05 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I93c0800a90b8c82a59e9f2de7d89d78bf8304733
The Android Automerger [Thu, 23 May 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Wed, 22 May 2013 22:54:57 +0000 (15:54 -0700)]
camera3: Fix zsl buffers released-while-in-use race condition
Bug:
9007356
Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf
Igor Murashkin [Wed, 22 May 2013 19:56:26 +0000 (12:56 -0700)]
am
ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
* commit '
ed49d7b57e66cc2520817b345ef9de289d688bd4':
camera3: Fix recording failure when switching resolutions while preview on
Igor Murashkin [Wed, 22 May 2013 19:54:28 +0000 (19:54 +0000)]
Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
Mansoor Aftab [Wed, 22 May 2013 19:17:38 +0000 (12:17 -0700)]
am
c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp
* commit '
c2c874d88df1b4be52f5415de6606785691bba1f':
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
Mansoor Aftab [Wed, 22 May 2013 01:58:53 +0000 (18:58 -0700)]
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
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>
Igor Murashkin [Tue, 21 May 2013 18:38:49 +0000 (11:38 -0700)]
camera3: Fix recording failure when switching resolutions while preview on
Bug:
9069574
Change-Id: Ife2ae5467f799dbe37e66714b3a6c9a51e1fe328
Igor Murashkin [Fri, 17 May 2013 21:39:53 +0000 (14:39 -0700)]
Camera3: Make sure new metadata results signal other threads waiting
- Also adds a lot of logging around shuffling around metadata frames
Bug:
9007356
Change-Id: I4285f4f55b4b899ea4928d43062c705619c8248a
The Android Open Source Project [Wed, 22 May 2013 14:22:53 +0000 (07:22 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a95a80d2225eb4a27e8bab567f3838b838daf70
The Android Automerger [Wed, 22 May 2013 12:55:13 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Andreas Huber [Mon, 20 May 2013 16:13:23 +0000 (09:13 -0700)]
Avoid a deadlock during EmptyBufferDone
The deadlock happens withen in the case where we use an OMX encoder with a
GraphicBufferSource.
Bug:
8329090
Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45
Jamie Gennis [Tue, 21 May 2013 18:39:44 +0000 (11:39 -0700)]
am
f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev
* commit '
f21daf4718bbd5662eae843f5a56e039bd34a2f4':
Avoid a deadlock during EmptyBufferDone
Jamie Gennis [Tue, 21 May 2013 18:37:54 +0000 (18:37 +0000)]
Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev
Zhijun He [Tue, 21 May 2013 14:48:47 +0000 (07:48 -0700)]
am
01831d23: Camera2/3: Increase digital zoom steps
* commit '
01831d233c84da7f9092e62f143626918a5a747e':
Camera2/3: Increase digital zoom steps
Andreas Huber [Mon, 20 May 2013 16:13:23 +0000 (09:13 -0700)]
Avoid a deadlock during EmptyBufferDone
The deadlock happens withen in the case where we use an OMX encoder with a
GraphicBufferSource.
Bug:
8329090
Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45
Zhijun He [Mon, 20 May 2013 18:18:39 +0000 (11:18 -0700)]
Camera2/3: Increase digital zoom steps
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
The Android Open Source Project [Mon, 20 May 2013 15:20:18 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I35dd28838537b7d96b26cf3731e7391af23b4b86
The Android Automerger [Sun, 19 May 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Fri, 17 May 2013 19:54:31 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1d5a94ed7749af26f6eb8e5e06443bd83fc63753
Mathias Agopian [Fri, 17 May 2013 17:16:50 +0000 (10:16 -0700)]
am
e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev
* commit '
e2dfa5a4ea3459b155b4b403b7dafe2116d960d4':
update to Fence::waitForever() API change
Mathias Agopian [Fri, 17 May 2013 17:15:07 +0000 (17:15 +0000)]
Merge "update to Fence::waitForever() API change" into jb-mr2-dev
Andy McFadden [Fri, 17 May 2013 16:50:37 +0000 (09:50 -0700)]
am
4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev
* commit '
4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd':
Adjust timestamp scale
Andy McFadden [Fri, 17 May 2013 16:48:14 +0000 (16:48 +0000)]
Merge "Adjust timestamp scale" into jb-mr2-dev
Mathias Agopian [Fri, 17 May 2013 01:07:35 +0000 (18:07 -0700)]
update to Fence::waitForever() API change
Bug:
8988871
Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
Chong Zhang [Thu, 16 May 2013 21:02:50 +0000 (14:02 -0700)]
am
99f27cdf: wifi-display: retry UDP read/write to improve connection robustness
* commit '
99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6':
wifi-display: retry UDP read/write to improve connection robustness
Jean-Baptiste Queru [Thu, 16 May 2013 20:06:15 +0000 (13:06 -0700)]
Reconcile with AOSP
Andy McFadden [Wed, 15 May 2013 23:48:19 +0000 (16:48 -0700)]
Adjust timestamp scale
BufferQueue item timestamps are in nanoseconds, MediaCodec buffer
timestamps are in microseconds. Adjust.
Bug
8988357
Change-Id: Ib12824d7eea0316a14543c756e3a127c0866db6b
Chong Zhang [Thu, 16 May 2013 01:47:26 +0000 (18:47 -0700)]
wifi-display: retry UDP read/write to improve connection robustness
Bug:
8922753
Change-Id: Ie6d18f03afcb23d11e6f0e63403e8f0d59b70be8
The Android Automerger [Thu, 16 May 2013 12:55:25 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 16 May 2013 12:43:29 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iec30f1654f196ebae279ebf71648a2cb44fedc4b
Conley Owens [Wed, 15 May 2013 22:01:42 +0000 (15:01 -0700)]
Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp
-s ours so that jb-mr2-dev can continue fastforwarding to
jb-mr2-dev-plus-aosp.
Conley Owens [Wed, 15 May 2013 22:00:10 +0000 (15:00 -0700)]
Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev
-s ours, so that jb-mr1-dev-plus-aosp can continue fastforwarding to
jb-mr2-dev.
Eino-Ville Talvala [Wed, 15 May 2013 20:34:53 +0000 (13:34 -0700)]
am
7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
* commit '
7dd801bd108bff3e897e9e86c5f79f1ab05709d0':
Camera3: Fix fast flexible YUV->NV21 path.
Eino-Ville Talvala [Wed, 15 May 2013 15:58:27 +0000 (15:58 +0000)]
Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
The Android Automerger [Wed, 15 May 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Chong Zhang [Wed, 15 May 2013 02:14:52 +0000 (19:14 -0700)]
am
6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev
* commit '
6ed6a2e615e19d8c7c37e2a8ac017c01a74ba876':
wifi-display: misc fixes for M3 response parsing
Chong Zhang [Wed, 15 May 2013 02:13:15 +0000 (02:13 +0000)]
Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev
Igor Murashkin [Wed, 15 May 2013 01:28:02 +0000 (18:28 -0700)]
am
083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds
* commit '
083a08ac82704fdcc37334a4253ff075f703cc87':
Camera: don't spam RingBufferConsumer logs in eng builds
Eino-Ville Talvala [Tue, 14 May 2013 23:05:27 +0000 (16:05 -0700)]
Camera3: Fix fast flexible YUV->NV21 path.
A U by any other name may smell just as sweet, but the color's pretty
awful if you call it a V.
Henceforth they never will be UV.
Bug:
8949720
Change-Id: I4897e93d5a293e576bb1d7ba44d91792b869ad42
Igor Murashkin [Tue, 14 May 2013 23:17:12 +0000 (16:17 -0700)]
Camera: don't spam RingBufferConsumer logs in eng builds
Bug:
8969579
Change-Id: Ia51d4072725754fd3b6ca028232a605885376287
Elliott Hughes [Tue, 14 May 2013 22:02:33 +0000 (15:02 -0700)]
am
effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
* commit '
effc08ed1eb1d55ca13997ec96f72e40a0866394':
Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
Elliott Hughes [Tue, 14 May 2013 21:39:28 +0000 (21:39 +0000)]
Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
Elliott Hughes [Tue, 14 May 2013 21:39:28 +0000 (21:39 +0000)]
Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
Glenn Kasten [Fri, 10 May 2013 16:29:51 +0000 (09:29 -0700)]
Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
(cherry-pick of
da1a325bc0a1421f4233e62704da4fab8b0acf7b.)
Bug:
8895727
Change-Id: I29d5dcf8519600fdd2910345449c66a5c1284646
Glenn Kasten [Fri, 10 May 2013 16:29:51 +0000 (09:29 -0700)]
Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
(cherry-pick of
da1a325bc0a1421f4233e62704da4fab8b0acf7b.)
Bug:
8895727
Change-Id: I29d5dcf8519600fdd2910345449c66a5c1284646
The Android Automerger [Tue, 14 May 2013 19:57:59 +0000 (12:57 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Conley Owens [Tue, 14 May 2013 18:07:14 +0000 (11:07 -0700)]
am
c650e6ab: am
72c324ef: Empty test commit for AOSP
* commit '
c650e6abe84bc3ba34b347c71d10c8b973738f35':
Empty test commit for AOSP
Conley Owens [Tue, 14 May 2013 18:03:59 +0000 (11:03 -0700)]
am
72c324ef: Empty test commit for AOSP
* commit '
72c324efd5a0f632d8f2b57b9f587a540d809b82':
Empty test commit for AOSP
Igor Murashkin [Tue, 14 May 2013 18:03:36 +0000 (11:03 -0700)]
am
be03b28f: Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev
* commit '
be03b28fb20b0f978ddd0fd04b637ede5de9bf1b':
Camera: Pause preview when needing to delete jpeg/zsl streams
Eric Laurent [Tue, 14 May 2013 18:03:36 +0000 (11:03 -0700)]
am
375379a4: Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev
* commit '
375379a4cb8dd7bfbd745407b5462bdf79888153':
Fix unreleased mutex in ToneGenerator stopTone()
Igor Murashkin [Tue, 14 May 2013 18:02:26 +0000 (18:02 +0000)]
Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev
Conley Owens [Tue, 14 May 2013 17:14:40 +0000 (10:14 -0700)]
Empty test commit for AOSP
Eric Laurent [Tue, 14 May 2013 15:44:43 +0000 (15:44 +0000)]
Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev
The Android Automerger [Tue, 14 May 2013 12:55:20 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Mon, 13 May 2013 21:53:44 +0000 (14:53 -0700)]
Camera: Pause preview when needing to delete jpeg/zsl streams
Bug:
8876221
Change-Id: Idf9490a48462fa44d49c4ebe99425c3149ae6378
Igor Murashkin [Mon, 13 May 2013 20:48:46 +0000 (13:48 -0700)]
am
38ea629e: Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev
* commit '
38ea629ed2ccba17c763f697ced6d654a42bf699':
Camera3: Refactor stream code to be DRY
Igor Murashkin [Mon, 13 May 2013 20:47:17 +0000 (20:47 +0000)]
Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev
Eric Laurent [Mon, 13 May 2013 19:47:53 +0000 (12:47 -0700)]
Fix unreleased mutex in ToneGenerator stopTone()
Commit
09108ade introduced a regression by not releasing
the ToneGenerator mutex before exiting in case of error.
Bug:
8852855
Change-Id: I8ba2755b218842e2034ed8dbd54b18bf2a5fc571
The Android Automerger [Mon, 13 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Chong Zhang [Thu, 9 May 2013 08:27:59 +0000 (01:27 -0700)]
wifi-display: misc fixes for M3 response parsing
- fix wfd_video_format parsing w/ multiple H264-Codec
- fix handling of CRLF at end of M3 response
- fix missing wfd_client_rtp_ports
Bug:
8871667
Bug:
8875749
Change-Id: Idb0b5605313bba6ff067bcd765512bbed42e5202
Marco Nelissen [Sat, 11 May 2013 00:36:46 +0000 (17:36 -0700)]
am
0d24eb5e: Merge "Don\'t purge effects we\'re about to start using" into jb-mr2-dev
* commit '
0d24eb5e89963663150d38a320ec17244d39edf2':
Don't purge effects we're about to start using
Marco Nelissen [Sat, 11 May 2013 00:36:46 +0000 (17:36 -0700)]
am
519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-dev
* commit '
519f7624696cf43a7fafe21fd2108deaad0bfe4a':
Don't render buffers that have size 0
Marco Nelissen [Sat, 11 May 2013 00:35:30 +0000 (00:35 +0000)]
Merge "Don't purge effects we're about to start using" into jb-mr2-dev
Marco Nelissen [Sat, 11 May 2013 00:34:58 +0000 (00:34 +0000)]
Merge "Don't render buffers that have size 0" into jb-mr2-dev
Eino-Ville Talvala [Sat, 11 May 2013 00:03:27 +0000 (17:03 -0700)]
am
1d74d78f: Merge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-dev
* commit '
1d74d78feb36aa08cfba696b67278cb6bbed6bd2':
Camera2/3: Optimize a few YCbCr_420_888 copy paths
Eino-Ville Talvala [Fri, 10 May 2013 23:59:04 +0000 (23:59 +0000)]
Merge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-dev
Alex Ray [Fri, 10 May 2013 20:10:43 +0000 (13:10 -0700)]
am
da5405fb: Merge "Camera2: FoV quirk crop regions" into jb-mr2-dev
* commit '
da5405fb0453d8a8ce99ab303599ecb4b47c6ccb':
Camera2: FoV quirk crop regions
Alex Ray [Fri, 10 May 2013 20:07:33 +0000 (20:07 +0000)]
Merge "Camera2: FoV quirk crop regions" into jb-mr2-dev
Igor Murashkin [Thu, 9 May 2013 01:03:15 +0000 (18:03 -0700)]
Camera3: Refactor stream code to be DRY
Bug:
8851039
Change-Id: Iaac2926bfa25dd6e9db8b307765d4fe709b88d21
Eino-Ville Talvala [Fri, 10 May 2013 19:44:19 +0000 (12:44 -0700)]
am
747b8492: Camera3: Fix initial orientation configuration.
* commit '
747b84925886dec39cd7532637b9338054e649ef':
Camera3: Fix initial orientation configuration.
Eino-Ville Talvala [Fri, 10 May 2013 00:03:54 +0000 (17:03 -0700)]
Camera3: Fix initial orientation configuration.
One call to set orientation too many.
Bug:
8683719
Change-Id: I4b776fc8665eed940a1f18a6f617be4f1406e41a
Marco Nelissen [Fri, 10 May 2013 17:10:42 +0000 (10:10 -0700)]
Don't purge effects we're about to start using
By acquiring the new session id before releasing the old, we prevent
purging existing effects with the new session id that aren't currently
attached but will be once the player is switched to the new session id.
b/
8767565
Change-Id: I703881b69c5accd8832ac834246925a20ada4c21
Marco Nelissen [Thu, 9 May 2013 16:15:34 +0000 (09:15 -0700)]
Don't render buffers that have size 0
b/
8857451
Change-Id: I12a31a2f85af76602db9e6f0ec80632954b3f7ed
Eino-Ville Talvala [Fri, 10 May 2013 00:03:54 +0000 (17:03 -0700)]
Camera3: Fix initial orientation configuration.
One call to set orientation too many.
Bug:
8683719
Change-Id: I4b776fc8665eed940a1f18a6f617be4f1406e41a
Eino-Ville Talvala [Thu, 9 May 2013 19:10:35 +0000 (12:10 -0700)]
Camera2/3: Optimize a few YCbCr_420_888 copy paths
Covers cases where the HAL format and the API format have the same
chroma layout.
Bug:
8734880
Change-Id: Ia735082c260b5914fc14f12551f91917c4e53b01
Igor Murashkin [Thu, 9 May 2013 19:05:05 +0000 (12:05 -0700)]
am
e464e15a: Merge "camera3: Manage fences properly when buffers are returned with an error" into jb-mr2-dev
* commit '
e464e15a31bb57754a227f5058299160e6d47ebb':
camera3: Manage fences properly when buffers are returned with an error
Igor Murashkin [Thu, 9 May 2013 19:04:59 +0000 (12:04 -0700)]
am
7fe6ac0d: Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev
* commit '
7fe6ac0de4b36f89a7f20dafb693e814344f9b4d':
camera2: Add height to the crop region metadata property
Igor Murashkin [Thu, 9 May 2013 19:01:31 +0000 (19:01 +0000)]
Merge "camera3: Manage fences properly when buffers are returned with an error" into jb-mr2-dev
Igor Murashkin [Thu, 9 May 2013 19:01:18 +0000 (19:01 +0000)]
Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev
Eino-Ville Talvala [Thu, 9 May 2013 17:19:39 +0000 (10:19 -0700)]
am
19cb41fb: Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-dev
* commit '
19cb41fbee0218c51345844a59437ee8c087c970':
Camera3: Support flexible YUV for preview callbacks
Eino-Ville Talvala [Thu, 9 May 2013 17:13:44 +0000 (17:13 +0000)]
Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-dev
Igor Murashkin [Tue, 7 May 2013 17:58:13 +0000 (10:58 -0700)]
camera3: Manage fences properly when buffers are returned with an error
Bug:
8622089
Change-Id: I4df0258d6803d460d4dd98f0a80829eb844ca30d
The Android Automerger [Wed, 8 May 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Tue, 7 May 2013 23:57:52 +0000 (16:57 -0700)]
am
a5751c3a: Merge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect" into jb-mr2-dev
* commit '
a5751c3ade37923ef7b36c53c36bb55ef7076a3b':
Camera: Hotplug - conditionally transition to PRESENT when clients disconnect
Igor Murashkin [Tue, 7 May 2013 23:42:30 +0000 (23:42 +0000)]
Merge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect" into jb-mr2-dev
Alex Ray [Tue, 7 May 2013 21:31:02 +0000 (14:31 -0700)]
Camera2: FoV quirk crop regions
Bug:
8484377
Change-Id: I5ffcc20b68dc92b502acc9898e57f12cadb92848
Igor Murashkin [Tue, 7 May 2013 20:22:15 +0000 (13:22 -0700)]
camera2: Add height to the crop region metadata property
Bug:
8756080
Change-Id: I90b9166440e92f7675255a01ddc4a980c2e52201
Eino-Ville Talvala [Sun, 5 May 2013 01:24:30 +0000 (18:24 -0700)]
Camera3: Support flexible YUV for preview callbacks
When the HAL supports it, and the client asks for YV12 or NV21,
use the new flexible YUV format instead.
Bug:
8734880
Change-Id: Ib0129d9c26a6b30f3be7aa624c2439c6edba1bbd
The Android Automerger [Tue, 7 May 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
OSDN Git Service
