Commit Graph

1329 Commits

Author SHA1 Message Date
Lajos Molnar
3f514b5230 am d8e6a8b7: am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
* commit 'd8e6a8b7643ffa037fbd0e409674c450f0296809':
  camera2: limit flexYUV array size in DngCreator
2015-02-03 23:27:55 +00:00
Lajos Molnar
d8e6a8b764 am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112
* commit '6999ef348818ec62a931f539c2caa799728b8a90':
  camera2: limit flexYUV array size in DngCreator
2015-02-03 23:23:11 +00:00
Lajos Molnar
fdb2112bbc camera2: limit flexYUV array size in DngCreator
corrected overread

Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
2015-02-03 14:57:09 -08:00
Zhijun He
0e99c2260d Camera2: metadata spec update for reprocessing
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
2015-01-29 15:26:05 -08:00
Jinsuk Kim
b744db8715 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
automerge: 7e79bdb

* commit '7e79bdb494b51175d9873f82f4ca8488ac6fccfa':
  CEC: Do null/empty check against the parameter for checkRecordSource()
2015-01-29 22:41:23 +00:00
Jinsuk Kim
7e79bdb494 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev
* commit 'eb2c4a07a118bb6f41455ffd14f35086298675cd':
  CEC: Do null/empty check against the parameter for checkRecordSource()
2015-01-29 22:37:01 +00:00
Jinsuk Kim
dbdaea0c6d Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 2015-01-29 22:22:31 +00:00
Mike Lockwood
2a57bc7fd6 MidiManager: Add USB peripheral MIDI support
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.

Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
2015-01-29 12:59:28 -08:00
Jinsuk Kim
c8aaaef20f CEC: Do null/empty check against the parameter for checkRecordSource()
This prevents out-of-bound exception from occurring.

Bug: 19188370
Change-Id: I051dccf7760cb542ea3dc9b0adc9625fa2ad8b1f
2015-01-29 16:28:37 +09:00
Eino-Ville Talvala
3537112124 am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21
automerge: 745d45e

* commit '745d45e0c02588762cc05d7bf3a6f5542830a987':
  Camera2 legacy: Do not advertise NV21 support.
2015-01-28 23:32:50 +00:00
Eino-Ville Talvala
745d45e0c0 am 06b1014c: Merge "Camera2 legacy: Do not advertise NV21 support." into lmp-mr1-dev automerge: a17ab21
* commit '06b1014cf28431706d42219549170896bd581a29':
  Camera2 legacy: Do not advertise NV21 support.
2015-01-28 23:29:23 +00:00
Eino-Ville Talvala
ccf6e88eec Camera2 legacy: Do not advertise NV21 support.
Also reduce logging somewhat for common scenarios.

Bug: 19161738
Change-Id: If96ed7d2bac0229159564072d7969d7bea3fae27
2015-01-28 12:57:56 -08:00
Chien-Yu Chen
25af2fc0cc Merge "CameraManager: add torch mode APIs for flashlight" 2015-01-28 18:24:47 +00:00
Chien-Yu Chen
c8c109b403 CameraManager: add torch mode APIs for flashlight
Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ifb66c309f23fd7e9f124016e0d9c6b364d19acdd
2015-01-27 16:55:16 -08:00
Zhijun He
503e815a6f Camera2: add lens facing EXTERNAL enum
This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-23 23:58:45 +00:00
Jinsuk Kim
f6483ac515 am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev automerge: 9ae7d49
automerge: 55055d6

* commit '55055d690e77ab4547e2598d7da48e274b7adc67':
  CEC: Add logic to return to internal source
2015-01-23 07:04:38 +00:00
Jinsuk Kim
55055d690e am 76cf0355: Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev
automerge: 9ae7d49

* commit '9ae7d4975ce471a7b295282ca999cb20a6cbb273':
  CEC: Add logic to return to internal source
2015-01-23 07:00:40 +00:00
Jinsuk Kim
76cf035513 Merge "CEC: Add logic to return to internal source" into lmp-mr1-dev 2015-01-23 06:51:58 +00:00
Eino-Ville Talvala
ac829206a9 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5 automerge: 0ec0465
automerge: 92baed1

* commit '92baed1212dffcae042a33f5575f99d3e00f81c8':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
2015-01-23 00:55:23 +00:00
Eino-Ville Talvala
92baed1212 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5
automerge: 0ec0465

* commit '0ec0465542ba41634ed13dd6bae2eca6afa62d4a':
  Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
2015-01-23 00:31:41 +00:00
Eino-Ville Talvala
7fde5e5ba3 Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev 2015-01-23 00:05:26 +00:00
Jinsuk Kim
cb8661c08f CEC: Add logic to return to internal source
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
2015-01-22 16:58:26 +09:00
Eino-Ville Talvala
fa0b9a00b4 Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
Add missing implementation.
Also improve docs for flexible Surface sources.

Bug: 19076351
Change-Id: I1f1126a291480dcb68d3dd90825b5994e54dcc99
2015-01-21 16:49:59 -08:00
Jinsuk Kim
0ae35a8a26 am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev automerge: 375ae7b
* commit '00959a56e5869fcb8d05399656fddc9da54e86dc':
  Mark TimeUnit as @SystemApi
2015-01-20 23:54:47 +00:00
Jinsuk Kim
00959a56e5 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev
automerge: 375ae7b

* commit '375ae7ba3263ee8eceeb371b170e9181c801c612':
  Mark TimeUnit as @SystemApi
2015-01-20 23:47:44 +00:00
Jinsuk Kim
28d2a693ef Mark TimeUnit as @SystemApi
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
2015-01-21 07:33:40 +09:00
Paul McLean
96798efe99 Merge "Support for simultaneous USB Audio Devices connect/disconnect" 2015-01-09 23:12:37 +00:00
Paul McLean
0a8f06922f Support for simultaneous USB Audio Devices connect/disconnect
Attach/Detach logic
Decoupling card# and list index
Modern loop constructs
Consistent logging flags
Add class/type flags to device "address" string.
Factored UsbAudioDevice out of UsbAudioManager.

Bug: 18399845
Bug: 18717784

Change-Id: I6f185e1c24091d4c0d21eb7e922a1496748d32c3
2015-01-09 14:56:43 -08:00
Narayan Kamath
fa8d52fef4 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
automerge: 6ed2140

* commit '6ed21403e7dea44a70ae06da64229a557ee19c98':
  camera2: Clarify the documentation on the ImageReader usecase
2015-01-07 18:44:33 +00:00
Narayan Kamath
6ed21403e7 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit 'e02fe5afac0bc792559a4c424ffc8391c501abfe':
  camera2: Clarify the documentation on the ImageReader usecase
2015-01-07 18:42:57 +00:00
Martin Storsjo
5c533e4fa0 camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.

Change-Id: I75261baf162a58c415705db99afa474c3826f900
2015-01-07 20:10:25 +02:00
Yin-Chia Yeh
cabe15ac76 am 641178f9: am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
* commit '641178f94fa5561cb5fe2f893f689b7cd568eaa1':
  Camera: doc update for color aberration modes
2015-01-07 00:57:59 +00:00
Yin-Chia Yeh
641178f94f am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
* commit 'c2112a75983cce62ed493ec0feafbb2c27ad76b4':
  Camera: doc update for color aberration modes
2015-01-07 00:10:51 +00:00
Yin-Chia Yeh
941aac0c07 Camera: doc update for color aberration modes
Code-gened document update for camera2 spec.

Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
2015-01-06 18:46:15 +00:00
Jinsuk Kim
a8f6c40f8a am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev
automerge: fe3cdf0

* commit 'fe3cdf015e42168954f20125e7c9f4495f9d4647':
  CEC: Let MHL device be of type 'source'
2015-01-05 07:25:06 +00:00
Jinsuk Kim
fe3cdf015e am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev
* commit '877919bb182dbd8c87901cb94f318cf5d5408bc8':
  CEC: Let MHL device be of type 'source'
2015-01-05 07:23:05 +00:00
Jinsuk Kim
e416d0f67b CEC: Let MHL device be of type 'source'
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().

Bug: 18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
2015-01-05 16:07:28 +09:00
Ruben Brunk
00b2eb2bc0 am c7c20b34: am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev automerge: 81b381b
* commit 'c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c':
  camera2: Fix LEGACY YUV production and orientation.
2014-12-12 04:21:07 +00:00
Ruben Brunk
c7c20b34ec am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
  camera2: Fix LEGACY YUV production and orientation.
2014-12-12 04:09:55 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation.
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
2014-12-11 11:35:46 -08:00
Ruben Brunk
fe6a5ae924 am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
2014-12-10 17:44:36 +00:00
Ruben Brunk
28089cc39b Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033
automerge: 6d98265

* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
2014-12-09 23:20:39 +00:00
Ruben Brunk
3ef5033cda Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 2014-12-09 23:09:52 +00:00
Ruben Brunk
f4a637d0be Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
2014-12-09 11:56:22 -08:00
Eino-Ville Talvala
18f5141dd8 am b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
* commit 'b71d983a7ff7ba0d993c32692035ae92db0c9a44':
  Camera2: Add HDR scene mode for backwards compatibility.
2014-12-09 00:19:23 +00:00
Zhentao Sun
af67d49865 am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
* commit 'b97782f2dac9714e4b6037a6d82a259f32816a5a':
  Fixed a leak in GeofenceHardwareImpl.java.
2014-12-09 00:16:01 +00:00
Eino-Ville Talvala
b71d983a7f am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.
2014-12-08 19:17:38 +00:00
Zhentao Sun
b97782f2da am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
* commit '4f04cb20cc37d7a70c2a50af97cc6fd6d064bb06':
  Fixed a leak in GeofenceHardwareImpl.java.
2014-12-08 19:09:36 +00:00
Eino-Ville Talvala
f4eac12954 Camera2: Add HDR scene mode for backwards compatibility.
To maximize backwards compatibility, support the HDR scene mode fully,
as it was supported on Camera HAL1 / Camera API1.

Bug: 18639933
Change-Id: I35c164563379f7f820b42c674bd91f706061170c
2014-12-05 11:31:08 -08:00
Yin-Chia Yeh
18be00f77a Camera2: add toString implementation of LensShadingMap
Change-Id: Icecde57e92c2962ed6b1585c0e3fd889b2587736
2014-12-04 15:53:17 -08:00