OSDN Git Service
Igor Murashkin [Fri, 11 Jan 2013 18:54:04 +0000 (10:54 -0800)]
am
f6892043: (-s ours) am
919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
* commit '
f68920430b5dd669f89e9a0f74b095229fddf42c':
Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
Igor Murashkin [Fri, 11 Jan 2013 18:54:03 +0000 (10:54 -0800)]
am
4c4b2a91: (-s ours) am
7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
* commit '
4c4b2a9120c59ed8172a0e94b4410e8f5c3143e3':
Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:08 +0000 (13:37 -0800)]
am
919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
* commit '
919cf643730fe7aacbbbaf014f2dfbf47521ecfa':
Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:07 +0000 (13:37 -0800)]
am
7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
* commit '
7e38f5faac9a8404bd13ea02cf136f1a69443715':
Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Igor Murashkin [Wed, 7 Nov 2012 01:02:54 +0000 (17:02 -0800)]
Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).
Change-Id: I3696243825901e5c7a7e4d0515831e76ae47ef4f
Igor Murashkin [Mon, 5 Nov 2012 19:14:49 +0000 (11:14 -0800)]
Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Change-Id: If5c922a0c0139b90c4781f022d80f7b9a0932e9e
Alex Ray [Thu, 27 Dec 2012 18:42:22 +0000 (10:42 -0800)]
modules: camera: Add tracing
Change-Id: I00ee447e6b57bc57fd09b6e7d8c62cb07cb37cf0
Alex Ray [Wed, 19 Dec 2012 20:21:38 +0000 (12:21 -0800)]
modules: camera: Defer documenting API
Avoid duplicating the api docs in the example HAL, instead point to
canonical source for them.
Change-Id: If3f5acb7a73260248bd00ce01cb1c80f230f7188
Jean-Michel Trivi [Wed, 26 Dec 2012 17:12:17 +0000 (09:12 -0800)]
Merge "Use strong pointers and scope"
Jean-Michel Trivi [Tue, 18 Dec 2012 19:30:33 +0000 (11:30 -0800)]
Use strong pointers and scope
Rely on strong pointers and scope rather than the more error prone
incStrong / decStrong approach which can cause object leaks.
No change in functionality.
Change-Id: I1bfc7f0cdeeac022e4120482cd3521e52ffea94e
Igor Murashkin [Fri, 21 Dec 2012 01:11:56 +0000 (17:11 -0800)]
Camera2: Tests: ModuleTests should not return OK for bad indices
Change-Id: Ia7a199d091edb4054dcd2d7164e57b3b653c5a64
Igor Murashkin [Wed, 19 Dec 2012 00:06:07 +0000 (16:06 -0800)]
Camera2: Tests: Fix Camera2Test to be correct.
- Requests were missing control type (capture vs reprocess)
- Not waiting for streams to be drained before disconnecting (sporadic fails)
Change-Id: Iab218b89a663db6dc26d791a390d0e11667f6889
Igor Murashkin [Tue, 18 Dec 2012 22:08:27 +0000 (14:08 -0800)]
Camera2: Tests: Ignore V1 device initialization failures.
This allows CameraModuleTests.LoadModule and GetCameraInfo to pass.
Change-Id: Id6e38afc6d9c5d45933d3117c7895775a30ee679
Igor Murashkin [Tue, 18 Dec 2012 21:40:32 +0000 (13:40 -0800)]
Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.
Producer would wait for buffers to be released so it could dequeue into them.
Since the test never acquired/released buffers, it would run out, and then
the HAL would deadlock when trying to shutdown since the producing thread
would never finish.
Change-Id: I4222feeec7a3ffab4c243e12b7d9bd56364ad983
Igor Murashkin [Tue, 18 Dec 2012 21:38:40 +0000 (13:38 -0800)]
Camera2: Tests: Release streams after HAL is unloaded
This fixes a segfault in the HAL where it was trying to write to a locked buffer
that disappeared from underneath it.
Any users of CameraModuleFixture should now call SetUp/TearDown explicitly.
Other classes remain unchanged until we need a custom TearDown order for them.
Change-Id: I9aa8c2d86492a76f2c01c1ad4cbe0cf91e5c7916
Andy McFadden [Tue, 18 Dec 2012 23:21:32 +0000 (15:21 -0800)]
Merge "Rename ISurfaceTexture and SurfaceTexture"
Igor Murashkin [Tue, 18 Dec 2012 22:49:48 +0000 (14:49 -0800)]
Merge "Camera2: Tests: Skip stream tests /w formats that are not available."
Igor Murashkin [Tue, 18 Dec 2012 22:49:30 +0000 (14:49 -0800)]
Merge "Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID"
Igor Murashkin [Sat, 15 Dec 2012 00:33:46 +0000 (16:33 -0800)]
Camera2: Tests: Skip stream tests /w formats that are not available.
Change-Id: I187ca983010483d1cb3ac951da2aa8b886828ef7
Igor Murashkin [Tue, 11 Dec 2012 23:19:25 +0000 (15:19 -0800)]
Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID
Change-Id: I0adfda42e861d7e5a85801f7e0c3f0b3950b6e0e
Andy McFadden [Tue, 18 Dec 2012 17:50:24 +0000 (09:50 -0800)]
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug
7736700
Change-Id: I7fc8474c1d0d95658609b69cdb0af412d69a42c4
Igor Murashkin [Wed, 12 Dec 2012 20:48:27 +0000 (12:48 -0800)]
Merge "Camera2: Add a test for bursting 10 frames at a time /w manual exp controls"
Andrew Hsieh [Wed, 12 Dec 2012 04:51:41 +0000 (20:51 -0800)]
Fix build
Change-Id: Iaf3bba12e3f34d351890320b25aa340e75c1972c
Mathias Agopian [Thu, 29 Nov 2012 01:21:55 +0000 (17:21 -0800)]
sensor HAL major revision
mainly update the documentation, add new sensor types
and add a batch mode.
- TYPE_PEDOMETER, defines a pedometer sensor
- TYPE_SIGNIFICANT_MOTION, defines a sensor that triggers an
event when the device is moving "enough". This sensor must allow
the SoC to go into suspend, while it is enabled.
- TYPE_STEP_COUNTER, defines a pedometer but returns a step count
(and looses precise timestamps, per step).
Change-Id: I3e20ff165851b7cb318f3c6637a6580de156b8fe
Igor Murashkin [Fri, 7 Dec 2012 23:08:35 +0000 (15:08 -0800)]
Camera2: Add a test for bursting 10 frames at a time /w manual exp controls
Change-Id: Idc1a3ebb26d0e189a543435f7f9be5f6376963d6
Greg Hackmann [Fri, 7 Dec 2012 18:32:58 +0000 (10:32 -0800)]
Fix GRALLOC_USAGE_SW_WRITE flag documentation
Change-Id: Ie553c521290358bf37c6954f65f790162aa43730
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Kenny Root [Wed, 5 Dec 2012 16:25:36 +0000 (08:25 -0800)]
am
1769442f: am
e847651d: Merge "All tests should fail immediate to avoid SEGV"
* commit '
1769442facb751a00a80959d492bc7f4797da4f2':
All tests should fail immediate to avoid SEGV
Igor Murashkin [Wed, 5 Dec 2012 00:54:52 +0000 (16:54 -0800)]
Merge "Camera2: Fix metadata symbols"
Kenny Root [Tue, 4 Dec 2012 23:35:52 +0000 (15:35 -0800)]
am
e847651d: Merge "All tests should fail immediate to avoid SEGV"
* commit '
e847651d45a1dd76004145d35346806acc6ef403':
All tests should fail immediate to avoid SEGV
Kenny Root [Tue, 4 Dec 2012 22:42:04 +0000 (14:42 -0800)]
Merge "All tests should fail immediate to avoid SEGV"
Kenny Root [Tue, 20 Nov 2012 22:37:40 +0000 (14:37 -0800)]
All tests should fail immediate to avoid SEGV
Change-Id: I7ec2861c079357b708cb6242f0171672afd55e02
Igor Murashkin [Mon, 3 Dec 2012 21:33:08 +0000 (13:33 -0800)]
Camera2: Fix metadata symbols
Change-Id: I5d7c8416b8ed8effca699aa9e51068f5678927ea
Igor Murashkin [Thu, 29 Nov 2012 17:54:16 +0000 (09:54 -0800)]
Merge "Camera2: Tests -- Fork each test before executing it"
Alex Ray [Tue, 6 Nov 2012 08:12:49 +0000 (00:12 -0800)]
Reference Camera v2 HAL Implementation
This is meant to be an example and a reference for device manufacturers
on how to build a new Camera v2 HAL. This first patch has basic
configuration and entry/exit.
Change-Id: Ib4166e2eadb813228af38ec31a1215940c070bbf
Igor Murashkin [Wed, 7 Nov 2012 01:02:54 +0000 (17:02 -0800)]
Camera2: Tests -- Fork each test before executing it
Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).
Change-Id: Ib639885bdb827fc2415c878cbcb1b2d84dff687b
Mathias Agopian [Tue, 20 Nov 2012 23:41:25 +0000 (15:41 -0800)]
am
65b35c04: am
48697f6d: Fix HWC documentation.
* commit '
65b35c047433a413617a877d9785d36c9da4b612':
Fix HWC documentation.
Mathias Agopian [Tue, 20 Nov 2012 23:39:48 +0000 (15:39 -0800)]
am
48697f6d: Fix HWC documentation.
* commit '
48697f6dc249d1238243677de77d3a0eb6a17b3f':
Fix HWC documentation.
Mathias Agopian [Tue, 20 Nov 2012 23:23:25 +0000 (15:23 -0800)]
Fix HWC documentation.
Specify more clearly the behavior of compositionType
and hints.
Change-Id: I9abdccedd904b2fba783381bf9e2f8975ede8d67
Mathias Agopian [Thu, 8 Nov 2012 23:57:38 +0000 (15:57 -0800)]
Add support for new sensor types
- add support for SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED
- add support for SENSOR_TYPE_GAME_ROTATION_VECTOR
- add support for SENSOR_TYPE_GYROSCOPE_UNCALIBRATED
Change-Id: I83048eb239d2123b5ec1f411b99f1883080a646f
Igor Murashkin [Tue, 6 Nov 2012 21:30:26 +0000 (13:30 -0800)]
Merge "Camera2: Automated tests for testing HAL2.0 interface"
The Android Open Source Project [Tue, 6 Nov 2012 20:27:28 +0000 (12:27 -0800)]
am
3a49cd8b: (-s ours) am
bdcf8251: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
3a49cd8b15a854ef18aae96a8f32dcd403aa81a8':
The Android Open Source Project [Tue, 6 Nov 2012 20:24:27 +0000 (12:24 -0800)]
am
bdcf8251: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
bdcf82513c64690ee0de6a791fdf07b005ebd43d':
The Android Open Source Project [Tue, 6 Nov 2012 20:17:39 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ibadcd642e060d8b828b13f7c748f0dfddf751906
Igor Murashkin [Mon, 5 Nov 2012 19:14:49 +0000 (11:14 -0800)]
Camera2: Automated tests for testing HAL2.0 interface
Change-Id: I1f1afd5afc346d5493d5019af35c3026efcf19b5
Glenn Kasten [Fri, 2 Nov 2012 18:16:13 +0000 (11:16 -0700)]
Fix build
Change-Id: I17094052b67f2069d80ea140442e5a969bd4e96f
The Android Open Source Project [Thu, 1 Nov 2012 14:54:36 +0000 (07:54 -0700)]
am
d9db09d7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
d9db09d723538253169d4e297ff4fa974d16809e':
The Android Open Source Project [Thu, 1 Nov 2012 14:52:10 +0000 (07:52 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ieb5a478a87c7f3a3bb38e588c92e6768c047bb29
The Android Automerger [Thu, 1 Nov 2012 01:34:07 +0000 (18:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Wed, 31 Oct 2012 21:03:30 +0000 (14:03 -0700)]
am
413f693c: am
90b0fbd1: Shutdown audio pipe when closing input stream
* commit '
413f693c90c0f7191c27c70b192ca92a68aa77c7':
Shutdown audio pipe when closing input stream
Jean-Michel Trivi [Wed, 31 Oct 2012 21:00:49 +0000 (14:00 -0700)]
am
90b0fbd1: Shutdown audio pipe when closing input stream
* commit '
90b0fbd13f97127e29ea565c09b64cc25ab6e9c9':
Shutdown audio pipe when closing input stream
Jean-Michel Trivi [Wed, 31 Oct 2012 02:03:22 +0000 (19:03 -0700)]
Shutdown audio pipe when closing input stream
Writing to the audio pipe for the remote submix is blocking, unless
the audio output pipe is in shutdown mode. The playback thread
could stay blocked on the write if the input stream has already
been closed.
The change consists in shutting down the pipe also when the input
stream gets closed. When the pipe is in this state, simulate
timing in the write operation so we don't drain the output faster
than realtime.
Bug
7424646
Change-Id: I5feb3be642b0ee7eef10dee0141308684ee9c811
Marco Nelissen [Thu, 25 Oct 2012 18:03:22 +0000 (11:03 -0700)]
Remove unused methods from fx library API
Change-Id: Ifb1d8b596a34f8413819279c46cb236fd7fb04f4
The Android Open Source Project [Fri, 12 Oct 2012 14:33:29 +0000 (07:33 -0700)]
am
580904ea: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
* commit '
580904ea01f291b4b52dcea6da6345a2c3a16988':
The Android Open Source Project [Fri, 12 Oct 2012 14:31:16 +0000 (07:31 -0700)]
Reconcile with jb-mr1-factory-release - do not merge
Change-Id: Ic82b52d2ef117f9c7820c88a8e44b81b25766f80
The Android Automerger [Thu, 11 Oct 2012 15:19:20 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 15:08:11 +0000 (08:08 -0700)]
am
cf8f3b24: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
cf8f3b2426c788bb5d83e11bee74e128e9c37309':
The Android Open Source Project [Thu, 11 Oct 2012 15:05:17 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I385ce51e37f3116c03d7de78036f4ed7ad883641
The Android Automerger [Thu, 11 Oct 2012 14:03:53 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Thu, 11 Oct 2012 00:23:10 +0000 (17:23 -0700)]
am
40483c73: am
20c7f50c: Support querying active record sources
* commit '
40483c7371578ca7477ea0a07d6541fe1daf0f4c':
Support querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 23:34:11 +0000 (16:34 -0700)]
am
20c7f50c: Support querying active record sources
* commit '
20c7f50cd5d60ee7d76f2f502866187992e7675b':
Support querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 19:23:17 +0000 (12:23 -0700)]
Support querying active record sources
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug
7314859
Change-Id: I270f27eff4dcf1cc179089859a4c690140825ad1
The Android Open Source Project [Wed, 10 Oct 2012 16:47:46 +0000 (09:47 -0700)]
am
f97af999: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
f97af999b91122116b953d1f06b48c00e18a4531':
The Android Open Source Project [Wed, 10 Oct 2012 16:44:59 +0000 (09:44 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ib081b6a0369bd5a597e53ee3a5551f5a63b67939
The Android Automerger [Wed, 10 Oct 2012 15:55:55 +0000 (08:55 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:22 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 22:39:04 +0000 (15:39 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Tue, 9 Oct 2012 20:01:26 +0000 (13:01 -0700)]
am
44ecdf72: am
c7545189: hwcomposer: Specify set() call error behavior.
* commit '
44ecdf72686fdff76e6f1d76a12f734631f45d2c':
hwcomposer: Specify set() call error behavior.
Jamie Gennis [Tue, 9 Oct 2012 19:59:17 +0000 (12:59 -0700)]
am
c7545189: hwcomposer: Specify set() call error behavior.
* commit '
c7545189c8b260bbaf09653407450418a3d1860b':
hwcomposer: Specify set() call error behavior.
Jamie Gennis [Tue, 9 Oct 2012 02:23:56 +0000 (19:23 -0700)]
hwcomposer: Specify set() call error behavior.
Bug:
7308829
Change-Id: Ibab6f0d2929860f02c17d6ffadb326fc0c333c4d
The Android Open Source Project [Tue, 2 Oct 2012 16:21:11 +0000 (09:21 -0700)]
am
53694360: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
53694360600f087c1cb8e78e39451886b5cb07bf':
The Android Open Source Project [Tue, 2 Oct 2012 16:18:43 +0000 (09:18 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9bc9016d2ef2607e2a6fd596f9c6828872e7de6f
The Android Automerger [Tue, 2 Oct 2012 13:59:45 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Martijn Coenen [Mon, 1 Oct 2012 21:06:34 +0000 (14:06 -0700)]
am
0cc0492e: am
3fb2be64: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
* commit '
0cc0492eaba1c3bc9626534ef75832fec51bd966':
NFC HAL: Use a separate callback for data.
Martijn Coenen [Mon, 1 Oct 2012 21:04:35 +0000 (14:04 -0700)]
am
3fb2be64: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
* commit '
3fb2be64fffda871ab2d7a2bf8fb98a3cc8835a5':
NFC HAL: Use a separate callback for data.
Martijn Coenen [Mon, 1 Oct 2012 21:02:06 +0000 (14:02 -0700)]
Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
Jean-Michel Trivi [Mon, 1 Oct 2012 20:45:14 +0000 (13:45 -0700)]
am
b91ddfef: am
4d7640ae: Merge "bug
7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
* commit '
b91ddfef3d12c9e323e1dc081526521546b98b34':
bug
7253033 Add "exiting" state to remote audio submix module
Jean-Michel Trivi [Mon, 1 Oct 2012 17:15:09 +0000 (10:15 -0700)]
am
4d7640ae: Merge "bug
7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
* commit '
4d7640ae5143ce991ee76abe0622eaf272a149de':
bug
7253033 Add "exiting" state to remote audio submix module
The Android Automerger [Mon, 1 Oct 2012 01:17:45 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Sun, 30 Sep 2012 18:56:23 +0000 (11:56 -0700)]
Merge "bug
7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
Jean-Michel Trivi [Sun, 30 Sep 2012 18:08:06 +0000 (11:08 -0700)]
bug
7253033 Add "exiting" state to remote audio submix module
Support receiving a parameter that sets the remote audio submix
module in a state where the audio pipe will unblock any current
write operation and not block anymore.
Change-Id: Ia3119cd79972afff0de24187dae627855a468ebf
Martijn Coenen [Sun, 30 Sep 2012 18:06:22 +0000 (11:06 -0700)]
NFC HAL: Use a separate callback for data.
Bug:
7258325
Change-Id: I02d8ea1bdcb8ea6a9430e3dc286f5c2647277f72
The Android Automerger [Sun, 30 Sep 2012 13:59:43 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Alex Ray [Fri, 28 Sep 2012 19:51:21 +0000 (12:51 -0700)]
am
4ae33e93: am
cecacd4e: Camera2: Change JPEG transport header
* commit '
4ae33e93db3e761813ececca08b19c7a12227840':
Camera2: Change JPEG transport header
Alex Ray [Fri, 28 Sep 2012 19:49:25 +0000 (12:49 -0700)]
am
cecacd4e: Camera2: Change JPEG transport header
* commit '
cecacd4e71c35fd50dbe1e9855cbab0faa17b550':
Camera2: Change JPEG transport header
Alex Ray [Thu, 27 Sep 2012 22:48:23 +0000 (15:48 -0700)]
Camera2: Change JPEG transport header
The way buffers are passed to JPEG encoders makes it difficult to
account for a header offset. This explains moving the header to
the end, and clarifies the required header packing.
Bug:
7108816
Change-Id: I569cd0cde37bd6fd7110fbc95d7fced9a55cff9c
The Android Open Source Project [Mon, 24 Sep 2012 17:14:54 +0000 (10:14 -0700)]
am
ee7df8ca: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ee7df8cae454ba6fabd7cb7db88e27013456f891':
The Android Open Source Project [Mon, 24 Sep 2012 17:12:37 +0000 (10:12 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie1ba92a7c1b156a8a32deca7e2f55181f1c626eb
Eino-Ville Talvala [Mon, 24 Sep 2012 15:49:03 +0000 (08:49 -0700)]
am
13e8b51d: am
3a90d596: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
* commit '
13e8b51d5b1be40d95b7515ac291cd665ec8ae09':
Camera2: Add JPEG transport header
Eino-Ville Talvala [Mon, 24 Sep 2012 15:25:53 +0000 (08:25 -0700)]
am
3a90d596: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
* commit '
3a90d5964bc17ace1097e06a62d0410241c6c99c':
Camera2: Add JPEG transport header
The Android Automerger [Sat, 22 Sep 2012 16:42:02 +0000 (09:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Sat, 22 Sep 2012 01:33:50 +0000 (18:33 -0700)]
Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
The Android Automerger [Fri, 21 Sep 2012 13:59:54 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Thu, 20 Sep 2012 22:46:11 +0000 (15:46 -0700)]
am
5c1bafdb: am
919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev
* commit '
5c1bafdbce676af17d08ba4d0412edda8baecf56':
Document reentrancy and error conditions
Jesse Hall [Thu, 20 Sep 2012 21:13:53 +0000 (14:13 -0700)]
am
919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev
* commit '
919e1c45b77b99c0215a53ab93d8032abb6d8c26':
Document reentrancy and error conditions
Jesse Hall [Thu, 20 Sep 2012 21:13:07 +0000 (14:13 -0700)]
Merge "Document reentrancy and error conditions" into jb-mr1-dev
The Android Open Source Project [Thu, 20 Sep 2012 19:46:03 +0000 (12:46 -0700)]
am
1c63e86f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1c63e86f16aa01f2ef48747cc494bf8f9bba108a':
The Android Open Source Project [Thu, 20 Sep 2012 17:36:07 +0000 (10:36 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If425346af9f905a95bbcdcc41035ce937280528c
Jesse Hall [Thu, 20 Sep 2012 05:53:30 +0000 (22:53 -0700)]
Document reentrancy and error conditions
The hotplug callback is non-reentrant. The display config functions
return an error if called for a disconnected display type.
Change-Id: I52d11a53f9b30a7c39e98b0a9b07eb97a3d2becd
Eino-Ville Talvala [Wed, 19 Sep 2012 18:42:40 +0000 (11:42 -0700)]
Camera2: Add JPEG transport header
To simplify passing compressed JPEG data between the HAL and the
camera service, add a transport header for use with JPEG streams.
Bug:
7108816
Change-Id: I91060051f59032e66eaaab3ee9f651badd1f2ac0
OSDN Git Service
