OSDN Git Service
Alex Ray [Fri, 24 May 2013 22:41:53 +0000 (15:41 -0700)]
libcameraservice: missing argument when logging
Change-Id: I6f3da400f8f47a387968b9da4ee7cd8e0c9dea70
Igor Murashkin [Tue, 28 May 2013 23:51:18 +0000 (16:51 -0700)]
am
9f013a46: am
3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev
* commit '
9f013a46e150da01ebb267574d8095eef399cd0c':
camera3: Don't try to disconnect stream native windows more than once
Igor Murashkin [Tue, 28 May 2013 23:49:02 +0000 (16:49 -0700)]
am
3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev
* commit '
3c89a2e9d4ee10b9e955783af2ab9e9dd137922f':
camera3: Don't try to disconnect stream native windows more than once
Igor Murashkin [Tue, 28 May 2013 23:47:00 +0000 (23:47 +0000)]
Merge "camera3: Don't try to disconnect stream native windows more than once" into jb-mr2-dev
Igor Murashkin [Tue, 28 May 2013 22:31:39 +0000 (15:31 -0700)]
camera3: Don't try to disconnect stream native windows more than once
This fixes the multiple-disconnect-from-BufferQueue bug.
(In logs)
BufferQueue: [SurfaceView] disconnect: connected to another api (cur=0, req=4)
Bug:
9114681
Change-Id: I21ae1c5bd993701eea13648aa9994979a24eb210
The Android Open Source Project [Tue, 28 May 2013 20:50:15 +0000 (13:50 -0700)]
am
30ca8004: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
30ca8004cf259c5dceab5cec06cab5ae9a17d89b':
The Android Open Source Project [Tue, 28 May 2013 14:37:26 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id0d9ce35d7c0fe8ec3d2edd00e42df41fba064ea
The Android Automerger [Sun, 26 May 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Fri, 24 May 2013 22:30:14 +0000 (15:30 -0700)]
am
dd6b47e6: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
dd6b47e675a9601280ee1375fccee7c1ec01d9eb':
Camera3: Fix the deadlock during recording pinch zooming
camera3: Disable ZSL for limited mode camera HALs
camera3: Fix zsl buffers released-while-in-use race condition
The Android Open Source Project [Fri, 24 May 2013 22:28:17 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icbc5d05e35b35baffce494c53fca9caf82658760
Zhijun He [Fri, 24 May 2013 19:41:03 +0000 (12:41 -0700)]
am
22a5ddb6: am
6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
* commit '
22a5ddb68173b75053d838a30d091920cd0a1dca':
Camera3: Fix the deadlock during recording pinch zooming
Ed Heyl [Fri, 24 May 2013 19:40:59 +0000 (12:40 -0700)]
am
14e585c8: am
6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
* commit '
14e585c8e0667c13202dbefc52f9d00ffe161cf1':
camera3: Disable ZSL for limited mode camera HALs
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
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
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
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 [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 [Thu, 23 May 2013 23:51:44 +0000 (16:51 -0700)]
camera3: Disable ZSL for limited mode camera HALs
Bug:
9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
Marco Nelissen [Thu, 23 May 2013 22:40:45 +0000 (22:40 +0000)]
Merge "Add support for MPEG editlist gapless info"
Marco Nelissen [Thu, 23 May 2013 22:17:24 +0000 (15:17 -0700)]
Add support for MPEG editlist gapless info
Change-Id: I862d89c805d738db9bdf81a8f1c5b317ff968dff
Lajos Molnar [Wed, 15 May 2013 19:59:19 +0000 (12:59 -0700)]
stagefright: BufferProducer updates
Update BufferQueue and ConsumerBase users to new BufferQueue
API, to allow BufferQueue slots to be reused. Buffer consumers
generally now need to track the unique frameNumber belonging to
each frame acquired if they are using BufferQueue directly.
Otherwise, they can simply track the graphicBuffer.
Change-Id: I30ee3158cf40fb10bbd085241646d5f1128ee480
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug:
7093648
Igor Murashkin [Thu, 23 May 2013 20:45:08 +0000 (13:45 -0700)]
am
9b89c15d: am
ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
* commit '
9b89c15d9d8abb9408760ffdb022df4c4367685b':
camera3: Fix zsl buffers released-while-in-use race condition
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:05:36 +0000 (11:05 -0700)]
am
98730cd7: am
1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
* commit '
98730cd7456b32255a37d691a70f49df22975a72':
Camera3: Make sure new metadata results signal other threads waiting
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:06:43 +0000 (08:06 -0700)]
am
a842a2a6: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a842a2a61927be0c1f643e76c6ba072e6ae9f779':
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
Lajos Molnar [Wed, 22 May 2013 21:36:06 +0000 (14:36 -0700)]
stagefright: SoftVP8: Handle EOS flag on frames with content.
SoftVP8 decoder ignored frame content if EOS flag was set on
input frame. Now, decode the frame first, unless it is empty.
Change-Id: Id105a9eb86103a61390af3de60cae2507028e2d1
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9091495
Igor Murashkin [Wed, 22 May 2013 19:58:34 +0000 (12:58 -0700)]
am
b7337d56: am
ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
* commit '
b7337d56a72c9b20abf57e853953126d0aa3dd1a':
camera3: Fix recording failure when switching resolutions while preview on
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:19:26 +0000 (12:19 -0700)]
am
1d60db8b: am
c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp
* commit '
1d60db8bfce9becee9d101eacc58e2a673221622':
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
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:27:39 +0000 (07:27 -0700)]
am
cf2148e8: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
cf2148e863e2fed037aa0793d2822d9898289f17':
Avoid a deadlock during EmptyBufferDone
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:43:44 +0000 (11:43 -0700)]
am
9545b670: am
f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev
* commit '
9545b6707e8c2213806c71fa9b0cae608b8bc032':
Avoid a deadlock during EmptyBufferDone
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:50:50 +0000 (07:50 -0700)]
am
722e4892: am
01831d23: Camera2/3: Increase digital zoom steps
* commit '
722e4892e2afeb0c7abab84be1caa243d1692e28':
Camera2/3: Increase digital zoom steps
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
Dianne Hackborn [Mon, 20 May 2013 18:22:20 +0000 (11:22 -0700)]
Update to supply correct name for new power manager app ops.
Change-Id: Ia686319509d98a4f467479ea494e8a54f2c1e238
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:22:40 +0000 (08:22 -0700)]
am
d7630634: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d76306343048d1e16ba92e9eb8f024ad5dfe769d':
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
Chong Zhang [Sat, 4 May 2013 04:54:17 +0000 (21:54 -0700)]
wifi-display: add support for metadata mode on encoder output
pass buffer_handle_t from encoder output to HDCP encryptor input
Bug:
8968123
Change-Id: Iea8007ce568641e213fd2e3cf6947a6f7a95746c
The Android Open Source Project [Fri, 17 May 2013 19:56:09 +0000 (12:56 -0700)]
am
81972daf: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
81972daf3323a130ca06c9999a3a8530e33fece9':
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:18:44 +0000 (10:18 -0700)]
am
074eb387: am
e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev
* commit '
074eb387091ca464257601a2d23020e3e10a6915':
update to Fence::waitForever() API change
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:53:30 +0000 (09:53 -0700)]
am
b07d3c48: am
4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev
* commit '
b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc':
Adjust timestamp scale
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:05:19 +0000 (14:05 -0700)]
am
b5b2d03f: am
99f27cdf: wifi-display: retry UDP read/write to improve connection robustness
* commit '
b5b2d03fc2c154a613ba68b599cd474b3e6ccec3':
wifi-display: retry UDP read/write to improve connection robustness
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:10:12 +0000 (13:10 -0700)]
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:44:31 +0000 (05:44 -0700)]
am
affd710b: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
affd710b209cd09c5f2137b59a5699e1e521b83d':
Camera3: Fix initial orientation configuration.
Fix reverb at 48kHz
Fix error message to match CTS
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:02:42 +0000 (15:02 -0700)]
Merge branch 'jb-mr2-dev-plus-aosp'
-s ours so that jb-mr2-dev-plus-aosp can continue fastforwarding to
master.
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:49:50 +0000 (13:49 -0700)]
am
dfaccc77: am
7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
* commit '
dfaccc77508d5d0c6a4cc161ecb76d910c29f6c6':
Camera3: Fix fast flexible YUV->NV21 path.
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 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
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:16:05 +0000 (19:16 -0700)]
am
be06e9fc: am
6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev
* commit '
be06e9fcdee1b02d29681c73c42a23a530f25d13':
wifi-display: misc fixes for M3 response parsing
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: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
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:30:43 +0000 (18:30 -0700)]
am
0560ecdc: am
083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds
* commit '
0560ecdc2de3032a3cba2d6e4e00777b5186fd2a':
Camera: don't spam RingBufferConsumer logs in eng builds
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
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
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
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:04:51 +0000 (15:04 -0700)]
am
394b47e5: am
effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
* commit '
394b47e595fe6677fa85cfa0823170978e6479c8':
Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
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
OSDN Git Service
