summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-07-25camera2: @hide android.request.frameCountIgor Murashkin3-10/+17
API users should be using exclusively CaptureResult#getFrameNumber() HAL3 users should be exclusively using camera3_request_t::frame_count Change-Id: I164011c97a57fb9fb9c504ae4c5f394dcb36a4bc
2014-07-22Merge "camera: Annotate public/synthetic keys in the java code" into lmp-devIgor Murashkin1-0/+6
2014-07-22Camera2: replace int[] by HighSpeedVideoConfigurationYin-Chia Yeh2-5/+16
Use the new wrapper class to replace int[] representation. Also update the metadata description to disallow multiple streams to use different high speed video configurations. Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-17Merge "Move channel expansion/contraction functions out of USB audio HAL." ↵Paul McLean3-0/+349
into lmp-dev
2014-07-18Move channel expansion/contraction functions out of USB audio HAL.Paul McLean3-0/+349
Change-Id: I551bdf90315488791a7c05ebc70039ccebee209f
2014-07-17camera_metadata: partialResultCount should be optionalZhijun He3-6/+9
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
2014-07-17camera_metadata: Rename DNG capability to RAW.Eino-Ville Talvala4-82/+88
While this capability allows for saving DNG files, it's really about the camera device producing usable RAW data, either for application processing or saving as a DNG. Leave in the DNG name as an alias to ease transition; it will be removed when the next metadata update is made. Bug: 15415688 Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
2014-07-16camera: Annotate public/synthetic keys in the java codeIgor Murashkin1-0/+6
Change-Id: Ifc89153136a9be502b7b88addbd16a5de68a7bfc
2014-07-15Merge "DO NOT MERGE Virtualizer effect: add parameter to query ↵Jean-Michel Trivi1-1/+9
virtualization mode" into lmp-dev
2014-07-15DO NOT MERGE Virtualizer effect: add parameter to query virtualization modeJean-Michel Trivi1-1/+9
Change-Id: Ie3be4b20e9c7f1a1427b5ae21e6f6ea07c8e2886 (cherry picked from commit 2044f5c00fe126e9faaf03790478944222a353d6)
2014-07-15DO NOT MERGE Update virtualizer effect interface for elevation angleJean-Michel Trivi1-2/+8
Update the comments in the virtualization effect parameters to reflect how elevation angles are part of the virtual speaker angle query. Change-Id: Ic942cac40eea954a4f123729b92143a54518453c (cherry picked from commit 046dddfb4fbdbd8eda6f4f8ad0218cfde2b9a09e)
2014-07-14DO NOT MERGE Audio virtualizer effect: define new parameters for capability ↵Jean-Michel Trivi1-1/+22
query Change-Id: I8882e528047a74b425cfa10a1b10c4fef0286bc0 (cherry picked from commit 4f57d02bf3de631f88de1318f0e7e5258c50e0e2)
2014-07-10Merge "Fix const in memcpy_by_audio_format parameter"Andy Hung2-2/+2
2014-07-10Fix const in memcpy_by_audio_format parameterAndy Hung2-2/+2
Change-Id: I7bdeb587e45695e6a914918ba75f102048b2e0eb
2014-07-10camera2: Update medadata for BlackLevelPattern.Ruben Brunk2-8/+31
Bug: 15448889 Change-Id: I5d3393f4a1695664bc5315eb592fb0a4e154d22e
2014-07-10Merge "camera_metadata: Update capabilities enums"Eino-Ville Talvala4-81/+53
2014-07-10camera_metadata: Update capabilities enumsEino-Ville Talvala4-81/+53
A developer shouldn't see a device advertise a capability that's not documented. Leave in ZSL to enable in the future, but move it to the end. Change-Id: I78d888516880d5ce1371e8b6d3ff24e2f6e20685
2014-07-09Merge "camera2: Add NoiseProfile HAL tag."Ruben Brunk4-0/+132
2014-07-09camera2: Add NoiseProfile HAL tag.Ruben Brunk4-0/+132
Change-Id: Iac1b5b7708222b00a9eb1fb1adc85f0d0a7912cb
2014-07-07Merge "camera_metadata: Add aberration correction control"Zhijun He4-0/+351
2014-07-07Merge "Add float to uint volume conversion primitives"Andy Hung2-0/+98
2014-07-07Add float to uint volume conversion primitivesAndy Hung2-0/+98
Change-Id: I8e4ee7caae4703642952ca9b6ac948560aa1f7ba
2014-07-07camera_metadata: Add aberration correction controlZhijun He4-0/+351
Change-Id: I0a3530ee8d5550f0f2a58c4d7af284821d87cb4d
2014-07-04camera_metadata: update spec for RAW10Zhijun He2-12/+14
Bug: 15989722 Change-Id: Ic38ae596d5a472e990389d1fa221a82bea97b715
2014-07-02Add memcpy_by_channel_mask and memcpy_by_index_arrayAndy Hung4-0/+395
These functions are used for multichannel conversion. Another function memcpy_by_index_array_initialization() is provided to help set index arrays. Change-Id: Ib12f0f83d5892158c5d1681bb4fdf608ee05d20d
2014-07-02Merge "Add memcpy_by_channel_mask and memcpy_by_index_array"Andy Hung4-0/+395
2014-07-01Merge "Revert "Revert "camera2: Add legacy mode enum to supported hardware ↵Ruben Brunk4-8/+33
level."""
2014-07-02Revert "Revert "camera2: Add legacy mode enum to supported hardware level.""Ruben Brunk4-8/+33
This reverts commit ae137c1786f3f3b30c3e4000da8c033477b1b343. Change-Id: I19483d6964ee219fa4d33cd297e2d217cf0f230f
2014-07-01Revert "camera2: Add legacy mode enum to supported hardware level."Ruben Brunk4-33/+8
This reverts commit 101aa5ec543f0aecd147399dc085fc9355d0ddae. Change-Id: I03585a885312558a136dfced4d6f54c40fa0dab8
2014-07-01Merge "Revert "camera2: Add legacy mode enum to supported hardware level.""Ruben Brunk4-33/+8
2014-07-01camera2: Add legacy mode enum to supported hardware level.Ruben Brunk4-8/+33
Bug: 15116722 - Adds enum for a device running in compatibility mode. When running in compatibility mode, the Camera2 API is emulated using the deprecated Camera API, and many capabilities will not be supported. Change-Id: I94f31775699447a82d53b7f2a6f9fbdc0a5afb3f
2014-07-01Merge "camera2: Add legacy mode enum to supported hardware level."Ruben Brunk4-8/+33
2014-06-30system: media: extended audio_effects.conf for post-processing based upon ↵bryant_liu1-0/+14
stream types Change-Id: I1e692731eaa0c1c3ae8e1f5713e1e8e3e3af28c6
2014-06-26camera_metadata: Add high speed video supportZhijun He4-0/+351
Below tags are added/updated: - Add HIGH_SPEED_VIDEO in android.control.sceneMode - android.control.availableHighSpeedVideoConfigurations Change-Id: Ice2497c81d9feead7519f5d11f2bd5598093b4bc
2014-06-25camera_metadata: update supportedHardwareLevelZhijun He2-13/+41
Make the full hardware supportedHardwareLevel more accurately reflect the spec requirement. Also fixed some other minor spec issues. Change-Id: I7b55be03dcdeface15e73eff098f690f4f99a23f
2014-06-23am 35a7543a: am 77f0f32b: Merge "camera_metadata: update metadata type in ↵Narayan Kamath0-0/+0
metadata test" * commit '35a7543aa4bc843e7d25dbbdb28920d82719ea21': camera_metadata: update metadata type in metadata test
2014-06-23am a1cb1d5c: (-s ours) am 5a301aee: Merge "LP64 fixes for camera_metadata."Narayan Kamath0-0/+0
* commit 'a1cb1d5cde420ef4169a4a76c9c72ad30803e4ad': LP64 fixes for camera_metadata.
2014-06-23am 77f0f32b: Merge "camera_metadata: update metadata type in metadata test"Narayan Kamath1-23/+59
* commit '77f0f32b32adc5ba1134e7a68e4d907c4f695eb6': camera_metadata: update metadata type in metadata test
2014-06-23am 5a301aee: Merge "LP64 fixes for camera_metadata."Narayan Kamath3-118/+48
* commit '5a301aee08ee10feb8064c511e0f561b3eb7c945': LP64 fixes for camera_metadata.
2014-06-20camera2: Make minimum focus distance optional on LIMITED devicesIgor Murashkin2-2/+20
* It's still required for MANUAL_SENSOR capable devices Change-Id: Ie4ab330a738ac4c8e465eacade1bbc39bdb776fe
2014-06-20Merge "camera_metadata: update metadata type in metadata test"Narayan Kamath1-23/+59
2014-06-20camera_metadata: update metadata type in metadata testZhijun He1-23/+59
android.colorCorrection.transform was updated to rational type in metadata change. Also cleanup the code a little bit. Bug: 11691467 (cherry picked from commit 7e59ded046175c20258be150cbc94be085924d28) Change-Id: I2e029651117db809bacd7a3a566975db8eb7168b
2014-06-20LP64 fixes for camera_metadata.Narayan Kamath3-118/+48
camera_metadata packets are transferred across process boundaries with Parcel::readBlob / Parcel::writeBlob calls so we should make sure they have a consistent layout across 32 and 64 bit processes. In this change : - Replace size_t members with uint32_t members. - Remove the "void*" user pointer which is no longer required (cherry picked from commit 21532655a531cf1168f10b8b974e2cef3061dd91) Change-Id: Iae8d169c8ab4e708128531e09dbe140c3f3b395a
2014-06-20LP64 fixes for camera_metadata.Narayan Kamath3-132/+49
camera_metadata packets are transferred across process boundaries with Parcel::readBlob / Parcel::writeBlob calls so we should make sure they have a consistent layout across 32 and 64 bit processes. In this change : - Replace size_t members with uint32_t members. - Remove the "void*" user pointer which is no longer required Change-Id: Ia0eada5d8358be21d725c05d6105705186b3d9c8
2014-06-20Merge "LP64 fixes for camera_metadata."Narayan Kamath3-118/+48
2014-06-19camera2: Update docs for min frame duration.Ruben Brunk2-3/+13
Bug: 15116722 Change-Id: Ief8b05d46fa12f63cf6a5d41e312c94d5a033553
2014-06-17Fix shortened floating point WAV file writeAndy Hung1-2/+8
Also fix minor robustness issue in sf_open_write in case the target WAV file is opened in a protected directory. Change-Id: I4f9a0e2ba92b9e851bd034e40169513e7e08a92b
2014-06-16Merge "cts: Assertion fix for camera characteristics."Ruben Brunk1-2/+1
2014-06-16cts: Assertion fix for camera characteristics.Ruben Brunk1-2/+1
Change-Id: Ia5f833ec8deabf7c1a2e1cfdbc80f1b0d415ac4f
2014-06-12Merge "camera_metadata: Add timestampCalibration tag"Zhijun He4-25/+208