History log of /frameworks/av/camera/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ead2a754802d905590dcb3665f877d26f88cd93d 03-May-2017 Chien-Yu Chen <cychen@google.com> camera: Clarify ZSL supports

For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG
template.

Test: make
Bug: 34689167
Change-Id: I5d793da299e3a6f01d3cac17a1ea2267274730f3
nclude/camera/ndk/NdkCameraMetadataTags.h
00645f11812b19a51b459f327221b7b2aa690c08 19-Apr-2017 Chien-Yu Chen <cychen@google.com> camera: Update for enableZsl values in template

For apps targeting SDK versions O and newer, the value of enableZsl
may be true in still capture template. the value of enableZsl is
always false for other templates.

For apps targeting SDK versions older than O, the value of enableZsl
is always flase.

Test: make
Bug: 34983527
Change-Id: I06b2a18254a78bd6505e9b6e6addc09ebf0f925f
nclude/camera/ndk/NdkCameraMetadataTags.h
2c88559250dc3cf88c9809ef3f7211c668c5f0ba 08-Apr-2017 Dan Willemsen <dwillemsen@google.com> Remove .(ll)ndk suffix from (ll)ndk_library

Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Change-Id: I792e4647b38988db5d9f591d69688479ce9dc62b
dk/Android.bp
71c73a2985a7ac65ee597be3441ab300fa56e22e 21-Mar-2017 Emilian Peev <epeev@google.com> Camera: Support vendor tags from multiple providers

Different vendors could have different vendor tags.
A global vendor tag cache will store all available
vendor tag descriptors from different providers.
The cache will then be shared with each camera client.
Camera metadata will use specific vendor ids stored
in the metadata buffer to identify the correct vendor
tag provider.

Bug: 34275821
Test: adb shell /data/nativetest/cameraservice_test/cameraservice_test
--gtest_filter=CameraProviderManagerTest.MultipleVendorTagTest
Complete Camera/Camera2 CTS tests
Change-Id: I2262128f21a0167504f018230624e2a89786c467
ameraMetadata.cpp
endorTagDescriptor.cpp
idl/android/hardware/ICameraService.aidl
idl/android/hardware/camera2/params/VendorTagDescriptorCache.aidl
nclude/camera/VendorTagDescriptor.h
dk/impl/ACameraManager.cpp
b5df547bce900fa5764d735bee304e79c001d60d 21-Mar-2017 Yin-Chia Yeh <yinchiayeh@google.com> Camera: HAL1 recording batching support

Test: Angler HAL1 + batching normal recording mode
Bug: 35997432
Change-Id: If088715ccdb40163f44150c16deed62432692c07
amera.cpp
Camera.cpp
CameraClient.cpp
CameraRecordingProxy.cpp
CameraRecordingProxyListener.cpp
nclude/camera/Camera.h
nclude/camera/ICameraRecordingProxy.h
nclude/camera/ICameraRecordingProxyListener.h
nclude/camera/android/hardware/ICamera.h
nclude/camera/android/hardware/ICameraClient.h
ests/CameraZSLTests.cpp
ead847255f341c6543e27d77af64daccd7da2879 24-Mar-2017 Oleksiy Vyalov <ovyalov@google.com> Make CameraStatus::cameraId to use String16.

Java strings are passed as UTF16 and attempt to pass cameraId
with alpha symbols via CameraStatus leads either to corrupted
or null strings.

Test: build/flash/boot
Test: verified together with ag/1841664 that alpha camera ids
are passed correctly.

Change-Id: Ic6045322137c156aa03bbcdccfe81f8f0ecb0618
ameraBase.cpp
04563aafa0debc95d50951ca944abf37ef2777ce 09-Mar-2017 Pawin Vongmasa <pawin@google.com> Move hybrid interface from libbinder to libhidl/transport.

Also, merge android.hardware.media.omx@1.0-impl into libstagefright_omx.

Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Manual use of Camera, Photos, Play Movies and YouTube apps.
Test: Manual use of screen mirroring.

Bug: 33854657
Change-Id: Ie927bcafd86dc7e9509bb8b76bb3b51f9a423cc7
ameraserver/Android.mk
bbbbe84b3a7296c9c3266bb16e0dc98b11cb5939 01-Mar-2017 Eino-Ville Talvala <etalvala@google.com> Camera: Allow direct selection of operating mode

Instead of a true/false switch for high-speed mode, use an integer
enum instead and define the two existing modes, plus the start
of a vendor mode space.

For all non-high-speed modes, use the normal configuration path,
but pass the operating mode to the HAL.

Test: New CTS test passes
Bug: 34853980
Change-Id: I9dc2b2a2164e9779f079a30e936c4117bcf96efe
idl/android/hardware/camera2/ICameraDeviceUser.aidl
1cbdb4170cba2115c8397507a79938070e3032d4 28-Feb-2017 Eino-Ville Talvala <etalvala@google.com> Merge "Cameraserver: Use multiple hwbinder threads"
6566536c89a9e8646404bd2e671e3e081c181b4a 24-Feb-2017 Eino-Ville Talvala <etalvala@google.com> Cameraserver: Use multiple hwbinder threads

Some interactions between camera service and hwservicemanager require
multiple threads to execute without deadlocks, such as calling
getService() from within an onRegistered() callback.

Increase thread count to 3 to accomodate.

Also switch the order of listener registration and legacy provider
addition back to what it was originally.

Test: No deadlock when camera service is restarted
Bug: 35096594
Change-Id: I6def961d5765958fef284c0a1820e903abc851ef
ameraserver/Android.mk
ameraserver/main_cameraserver.cpp
e2b43843fd12783188edd2c54188ea8d26864788 02-Feb-2017 Vijay Venkatraman <vijaykv@google.com> Moved headers from include/ to appropriate libs

include/camera -> camera/include/camera
include/media/audiohal -> media/libaudiohal/include
include/media/AudioResampler*.h -> media/libaudioprocessing/include
include/media/Audio*.h,IAudio*.h,IEffect*.h,ToneGenerator.h -> media/libaudioclient/include
include/media/EffectsFactoryApi.h -> media/libeffects/include
include/media/stagefright -> media/libstagefright/include
include/media/nbaio -> media/libnbaio/include
include/media/<rest of files> -> media/libmedia/include
include/cpustats -> media/libcpustats/include/cpustats

Added symlinks from old location to new ones

Bug: 33241851

Test: VNDK linked modules will need to add explicit lib dep.
All other modules should compile the same

Change-Id: I0ecf754a2132640ae781a3cc31428fb8c0bd1669
ndroid.mk
nclude/camera/Camera.h
nclude/camera/CameraBase.h
nclude/camera/CameraMetadata.h
nclude/camera/CameraParameters.h
nclude/camera/CameraParameters2.h
nclude/camera/CameraUtils.h
nclude/camera/CaptureResult.h
nclude/camera/ICameraRecordingProxy.h
nclude/camera/ICameraRecordingProxyListener.h
nclude/camera/ICameraServiceProxy.h
nclude/camera/VendorTagDescriptor.h
nclude/camera/android/hardware/ICamera.h
nclude/camera/android/hardware/ICameraClient.h
nclude/camera/camera2/CaptureRequest.h
nclude/camera/camera2/OutputConfiguration.h
nclude/camera/camera2/SubmitInfo.h
nclude/camera/ndk/NdkCameraCaptureSession.h
nclude/camera/ndk/NdkCameraDevice.h
nclude/camera/ndk/NdkCameraError.h
nclude/camera/ndk/NdkCameraManager.h
nclude/camera/ndk/NdkCameraMetadata.h
nclude/camera/ndk/NdkCameraMetadataTags.h
nclude/camera/ndk/NdkCaptureRequest.h
bc1713d3b85d7ce656e032da6e4b6b342f14db03 14-Feb-2017 Mathias Agopian <mathias@google.com> fallout of splitting rect.h out of libandroid.

A lot of media makefiles didn’t specify libui or
libgui but included headers from these libraries
directly.

It works because these headers are on the global
include path. With this change, though, rect.h
is not anymore (albeit exported from libui).

Test: built and booted device
Bug: 35164655
Change-Id: I72e8f0b7bd25c6a67eedc17afe52c4c484a147fe
ameraserver/Android.mk
2d6140b8dce137f89029b12468e25d5911f23420 13-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge changes from topic 'api1_zsl_rework'

* changes:
Camera2: Add native test for framework-backed ZSL
Camera: Rework ZSL path when using API1 with HAL3
032845cc878f538e3336c96e1c24668953eab971 09-Feb-2017 Mathias Agopian <mathias@google.com> fallout of view::Surface / Surface split

Test: built and booted device
Bug: treble
Change-Id: I022ebb581563463e93935da61a113087043dfeca
amera2/CaptureRequest.cpp
amera2/OutputConfiguration.cpp
204e2c5ebd4047e417faa985fb0afd4d72f9d844 03-Feb-2017 Eino-Ville Talvala <etalvala@google.com> CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 am: 6cb1912505 am: 4f95157295 am: 7376ce23ad
am: 43605e237f

Change-Id: I35d434f0efc0cc77f7dc839c554fd164ae0ec4e4
7376ce23ad1c278822a4725ba81bd870519e64c8 03-Feb-2017 Eino-Ville Talvala <etalvala@google.com> CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 am: 6cb1912505
am: 4f95157295

Change-Id: I31c70615f0b81da32ebbd2262b262a9024e114dc
4f951572955e2d7c39bd629ddbfb45d4c05a93b9 03-Feb-2017 Eino-Ville Talvala <etalvala@google.com> CameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1
am: 6cb1912505

Change-Id: If68d75e176ef8c2fafe2288307a0b0e724c3f826
6cb19125052b31023b497b5e2f03f6963f4b48aa 03-Feb-2017 Eino-Ville Talvala <etalvala@google.com> CameraBase: Don't return an sp<> by reference am: f86177dd93
am: e1bdaa8fb1

Change-Id: I1c48315fdff2a24d31d62d6aaa550f7d3a02bdde
e1bdaa8fb12da64015318eab6ee5d30d5fe2368f 03-Feb-2017 Eino-Ville Talvala <etalvala@google.com> CameraBase: Don't return an sp<> by reference
am: f86177dd93

Change-Id: I899d9c4b668171f6e68fdcfac9c7b973831a6a25
f86177dd930680bf939ef33b9977db27628d7aff 02-Feb-2017 Eino-Ville Talvala <etalvala@google.com> CameraBase: Don't return an sp<> by reference

If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.

Test: Camera CTS passes
Bug: 31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348
ameraBase.cpp
b12fb5d4642ee1651ae4432d3bebc4b0a33469e9 26-Jan-2017 Emilian Peev <epeev@google.com> Camera2: Add native test for framework-backed ZSL

The test needs to make sure that all
necessary requirements for enabling the
framework-backed ZSL mode along the
API1->HAl3.x path are fulfilled. It should
then go through all supported picture
resolutions and try to take still
images in such conditions, that will
allow ZSL to remain active and process
frames from its own internal queue.

BUG: 34131351
Change-Id: Ife066397089abad94055e303e73e64abea038664
ests/Android.mk
ests/CameraZSLTests.cpp
6b2704c86f5f34217d820427da979c6bd6624bb8 26-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "camera: Add enable ZSL key"
c0dede99d99ab22f59cf34c3b7d262c80d7bbc4a 11-Jan-2017 Chien-Yu Chen <cychen@google.com> camera: Add enable ZSL key

Add enableZsl key so the apps can choose to allow or
disallow out of order frame contents and metadata like
timestamp.

Test: Camera CTS tests on Marlin
Bug: 30983997
Change-Id: I715ef24ab55d6941c0ece16f09f325c26b83ea54
dk/impl/ACameraMetadata.cpp
758c215374dba397dabe17b8e96dd38593c09dd7 11-Jan-2017 Shuzhen Wang <shuzhenwang@google.com> Camera: Combine handling of deferred surface and shared surface

- Refactor the OutputConfiguration to contain isDeferred and isShared
flag, and not contain NULL surface.
- Unify the handling of deferred surface and shared surface.

Test: Camera CTS, and manual testing of GoogleCamera use cases
Bug: 33777818
Change-Id: I5dd3472f0f2133699b0e9fbdd8ba456956222746
idl/android/hardware/camera2/ICameraDeviceUser.aidl
amera2/OutputConfiguration.cpp
addae1cfa92c3bae2b59917160da5520d2a25865 18-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "camera2: Add support for secondary surface for stream"
f675356f9e275b9a52101a997ad20404922b5147 11-Oct-2016 Brian Anderson <brianderson@google.com> Clean up Fence a little.

Test: No functional change.

Change-Id: Ie0836b4bd589cbadf219d893b44f82f70a051174
amera2/OutputConfiguration.cpp
b554bff208ec1af8b6a8cfd78a86103c8dd46089 11-Jan-2017 Bjoern Johansson <bjoernj@google.com> Merge "Fix NDK CameraManager crash when no cameras exist"
1a5954c3adc4dd6c265a7f454cc5d94825a0d1ee 10-Jan-2017 Bjoern Johansson <bjoernj@google.com> Fix NDK CameraManager crash when no cameras exist

The NDK CameraManager only lists cameras that support camera API v2. For
a device that only supports v1 the list comes back empty. This results
in allocating an array of size zero. This array was then intialized with
a nullptr. This is fine if the array contains at least one item but in
the case where there are no cameras this will cause a buffer overflow.
This change removes the initialization which fixes the crash.

Test: manual - ran camera CTS tests
Change-Id: Ie1c872ff66997d55572fd855f20b56bd58b01752
dk/impl/ACameraManager.cpp
0129d52df9794d6fdf06be304722b5cb51a2eab5 31-Oct-2016 Shuzhen Wang <shuzhenwang@google.com> camera2: Add support for secondary surface for stream

- Enhance OutputConfiguration to contain multiple surfaces for one
underlying stream.
- Create Camera3SharedOutputStream to handle streams with multiple
surfaces.
- Create Camera3StreamSplitter to handle buffer flows between camera and
multiple consumers.

Test: cts, and manually test camera preview/snapshot/recording
Bug: 33777818
Change-Id: Ia010c3cc9d9b4bd5b9ea03cc42fe4e0a0d8033f1
amera2/OutputConfiguration.cpp
20559df30cd7a1b0373d07f198a5845ce550f643 06-Jan-2017 Dan Albert <danalbert@google.com> Merge "Unversion NDK stub libraries." am: 0b4540f867 am: 17eea8c807 am: 34df2b45c1
am: 3c1d987a05

Change-Id: I985aae1a055c6684e791815e8fef90ff0f5e4ca3
1714f2e1da8720037b04456a44c16d30e37ad06a 06-Jan-2017 Dan Albert <danalbert@google.com> Unversion NDK stub libraries.

The system versions of these libraries aren't versioned yet.

Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: I139f34217c8855a366ecb537bfabf2ca0181e4d3
dk/Android.bp
2f09bac6632a5ee27ee14baa2aa1367f16b5b013 13-Dec-2016 Eino-Ville Talvala <etalvala@google.com> Camera: Update camera service to use new HIDL HALs, part 1

- Add CameraProviderManager
- Enumerates individual camera provider HAL instances, as well
as the devices they provide
- Handles dynamic provider and device appearance/disappearance
- Maps device names to public API namespace
- Add unit tests for CameraProviderManager
- Add logic to enable new HIDL path
- Switch various bits of service internals to use string camera IDs,
though leaving most camera1-facing bits using int IDs, since that's
what the old API uses.
- Update CameraService to use CameraProviderManager instead of
the legacy camera HAL
- Update clients to pass through provider manager to devices instead
of just camera module
- Still TODO:
- Update Camera3Device to use new HIDL interface
- Update CameraHardwareInterface to use new HIDL interface
- Update dump()
- Update vendor tag handling

Test: New unit tests pass, camera CTS passes with Treble disabled
Bug: 30985004
Bug: 32991422
Change-Id: I7ac41f13b9501d5e53256e28c0465ec70aa3980e
ameraserver/Android.mk
f51fca277eb5b86bd0b2e3fc90ecb2b63089de29 13-Dec-2016 Eino-Ville Talvala <etalvala@google.com> Camera service: Updates in preparation for HIDL

- For all camera2 paths, and anything shared between the legacy API and
camera2, switch to using strings for camera IDs
- Update ICameraService.addListener to return current set of known
devices and their status, to allow for immediate return of camera
devices when first connecting to camera service
- Remove unused code path for getCameraCharacteristics with HALv1
- Add namespace qualifiers to Binder objects that are also used by
hardware binder.
- Switch to using new HIDL DeviceStatus and TorchStatus enumerations
for better type safety in the service; map more clearly between
the HAL, service-internal, and Binder enums.

Test: cts-tradefed run cts -m Camera --skip-connectivity-check -d -o --abi armeabi-v7a --disable-reboot
Bug: 32991422
Change-Id: I765951d9a21000a8432bed9aa0e3604709daa4b1
ameraBase.cpp
aptureResult.cpp
endorTagDescriptor.cpp
idl/android/hardware/CameraStatus.aidl
idl/android/hardware/ICameraService.aidl
idl/android/hardware/ICameraServiceListener.aidl
amera2/CaptureRequest.cpp
amera2/OutputConfiguration.cpp
amera2/SubmitInfo.cpp
ameraserver/Android.mk
dk/impl/ACameraManager.cpp
dk/impl/ACameraManager.h
ests/CameraBinderTests.cpp
ac4b1d33f7b071ca3d1a48dba827ac91f7e584a6 08-Dec-2016 Tobias Lindskog <tobias.lindskog@sonymobile.com> Merge "Log correct reason for camera connect failures" am: b985e3c6ba am: 24048d59fb am: 7a1c05436e
am: 7e23b7150a

Change-Id: I4992ce1db1d01e1f36287ae988ca3105558f474c
b985e3c6bab78c60ef53164f157dd5bccf3045f9 08-Dec-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Log correct reason for camera connect failures"
0ccb13b8dd4f3e412d20ccb8c7587f1fac4d1152 01-Nov-2016 Tobias Lindskog <tobias.lindskog@sonymobile.com> Log correct reason for camera connect failures

Show the detailed error when we have it, rather than trying to show it
only when we don't.

Bug: 33358375
Change-Id: Ifa7a4f8de7b35a0379224efd1e27d6745844b853
ameraBase.cpp
dbb1afd703c1435e0be5d5fd85248ab48dac2b02 01-Dec-2016 Marco Nelissen <marcone@google.com> Remove unneeded libcutils references

mediaserver, mediadrmserver, cameraserver don't actually use libcutils

Change-Id: Ieac17ec8bce73910672db4e3e239bc6cbe5f0be0
ameraserver/Android.mk
5589a4f1167a7d4b780535a90b03c909ea05ed28 16-Nov-2016 Yunlian Jiang <yunlian@google.com> Merge "fix Access to field 'targets' results in a dereference of a null pointer" am: caea9fc26a am: 52caf00e7a am: f176757e68
am: 00ed920ff6

Change-Id: I2ec0b253e8f4bc53d5b683118b9a5817b994eeff
52caf00e7acf35d740d32333a995f44793f44816 16-Nov-2016 Yunlian Jiang <yunlian@google.com> Merge "fix Access to field 'targets' results in a dereference of a null pointer"
am: caea9fc26a

Change-Id: Id38c914a250aab0b4a395739db7e700c821ddaf3
2169303858f60f6c813be208ea3e088b073ef676 16-Nov-2016 Yunlian Jiang <yunlian@google.com> fix Access to field 'targets' results in a dereference of a null pointer

This fixes Access to field 'targets' results in a dereference of a null
pointer

Test: the warning is gone.
Change-Id: If5d8c1c87c4cf77252bd5d262eefeba30c772fe7
dk/NdkCaptureRequest.cpp
4f197ec220d2c9634429692dd37896233273111d 04-Nov-2016 Marco Nelissen <marcone@google.com> Merge "Remove unneeded links with dynamic libraries"
am: 46d0a5b493

Change-Id: Ica6dd538c30b9aeccddad229cb24ade4d82d2e4c
263506542fbe480ddb247597bdcef16c437b48dd 25-Oct-2016 Marco Nelissen <marcone@google.com> Remove unneeded links with dynamic libraries

Various media components were linking against dynamic libraries that weren't needed.

Test: built and booted

Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
ndroid.mk
ameraserver/Android.mk
c661ae6165338fd5f0bca50a63058b4bcd6def4b 25-Oct-2016 Marco Nelissen <marcone@google.com> Remove unneeded links with dynamic libraries

Various media components were linking against dynamic libraries that weren't needed.

Test: built and booted

Change-Id: I7379506fd06d4e28e0eff0001fd073a2d3860f8e
ndroid.mk
ameraserver/Android.mk
9d06601e54848f076b7472a376c672215cd70c46 30-Sep-2016 Shuzhen Wang <shuzhenwang@google.com> Camera2: Add onCaptureQueueEmpty callback

onCaptureQueueEmpty is called when the non-repeating request queue in
cameraservice becomes empty. Application can use this callback as a
trigger for a new request.

Test: testMultipleCapture in PerformanceTest.java

Bug: 29006447
Change-Id: Id21afd74381e0b70f924c6026025c91a8ffd5ee0
idl/android/hardware/camera2/ICameraDeviceCallbacks.aidl
dk/impl/ACameraDevice.cpp
dk/impl/ACameraDevice.h
ests/CameraBinderTests.cpp
09316fdbebc8e2e899f663aa1e4b1bcb0531354d 06-Oct-2016 Glenn Kasten <gkasten@google.com> Merge "LOCAL_CLANG := true is now the default"
5f5ee1110dd85001b43db7637a97474acfe8d681 16-Aug-2016 Glenn Kasten <gkasten@google.com> LOCAL_CLANG := true is now the default

Test: verify that build has no failures
Change-Id: Ib249b276c6295e55eb54fa37b6d15486415dfbed
dk/Android.mk
b01d8f7d7853e6cd4ea1256fe3dfb2e4a79cf09a 05-Oct-2016 Yunlian Jiang <yunlian@google.com> Fix warning: Potential leak of memory pointed to by 'device'

This fixes the waring: Potential leak of memory pointed to by 'device'

Change-Id: I7e80c36ef4a66bb0e9febef7941c87eb4a083110
Test: The warning is gone.
dk/impl/ACameraManager.cpp
c8deb6dde12f68f7625ea50fd398942bb896d37b 25-Sep-2016 Dimitry Ivanov <dimitry@google.com> Merge "Add missing liblog dependency" am: 9200a9aab7 am: cb092999cb
am: f68051a6be

Change-Id: I412248e299c26325a1992b58f4edeec83fdbfe0f
b8c32f06401c8948a69fa896a9afd768528b299f 24-Sep-2016 Dimitry Ivanov <dimitry@google.com> Add missing liblog dependency

Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Change-Id: Ic2e8a3d9e62d778d32863a4b794dc4c80b1b1b2b
ameraserver/Android.mk
d96f8837c9e1782e0309828b316cca5262719633 23-Sep-2016 Ivan Podogov <ginkage@google.com> Don't try to connect camera service if it is disabled.
am: ee844a8008

Change-Id: I1c63845947bc43ec2bed1a20641336cf8988e6f7
abc97dee27bdf8c909cfc8a3d1d27adad5e6fa39 20-Sep-2016 Dan Albert <danalbert@google.com> Merge "Migrate libcamera2ndk to ndk_library." am: b22e8ebf30 am: 15234be025
am: 27aed3e31c

Change-Id: I850c979db3eed9b109f2733ce8cc2a85b032b23f
ee844a800889eca5dfe658fbd953946ca1920fae 15-Sep-2016 Ivan Podogov <ginkage@google.com> Don't try to connect camera service if it is disabled.

On Android Wear devices we don't have cameras, so we don't need the
proxy service as well. If it is disabled by the system property, don't
wait for it to start, but rather return null pointer in
getCameraService(), which causes getNumberOfCameras() to report zero
cameras available.
The same logic applies to ACameraManager, where we return an empty list.

Bug: 28560707
Change-Id: I4c0bc29f061f1b66710c8188a7916bfaf089d23f
ameraBase.cpp
dk/impl/ACameraManager.cpp
d7973ba37cea1a9638ded23041c69774ae8cebbc 14-Sep-2016 Dan Albert <danalbert@google.com> Migrate libcamera2ndk to ndk_library.

Test: make checkbuild tests
Bug: http://b/30465923
Change-Id: Iab800fd20beeef64250abc7d1c966d12fa8bfbb5
dk/Android.bp
dk/libcamera2ndk.map.txt
2f919a49511af0b8736f6edb43d7ce579470b259 12-Sep-2016 Chih-hung Hsieh <chh@google.com> Merge "Fix google-explicit-constructor warnings in camera." am: f9ee5183c8 am: beff1fb18b
am: 019e54142c

Change-Id: I1278af9e5244995c7fdbc4ee7a54314571b3df3f
74b9ba1ccd8482f380261106cf9501f6bc2767df 31-Aug-2016 Eino-Ville Talvala <etalvala@google.com> Camera2: CaptureRequest: Use common code for Surface unparcel am: 48932bbf9f
am: 89c90769c0

Change-Id: Ifd68dcfaf9983fab83d6a76816ef800e17f3383e
48932bbf9f1e74282419a54c116afbb51a5db786 30-Aug-2016 Eino-Ville Talvala <etalvala@google.com> Camera2: CaptureRequest: Use common code for Surface unparcel

Don't re-implement the native unparceling of Surface, that's
what view::Surface is for.

Bug: 31162160
Test: Camera CTS passes
Change-Id: I31eae73ba08d820e4b17f2bcd3867d8f4473d68f
amera2/CaptureRequest.cpp
2a4b85a653b3a6e5c78b7faa00dd2ce795bff8ee 30-Aug-2016 Pablo Ceballos <pceballos@google.com> camera2: Add parcel/unparcel for missing Surface field. am: ccdf3e2f41
am: 5f2706f567

Change-Id: I554aa0c07d4376aa9dcfc7e1cc9f9f7e3f8b5d0c
ccdf3e2f4104d7e43ba790220e2703ab27671af2 30-Aug-2016 Pablo Ceballos <pceballos@google.com> camera2: Add parcel/unparcel for missing Surface field.

Read/write the newly added isSingleBuffered int in CaptureRequest.

Bug 31162160

Change-Id: I1801079648771579917d73695d0c060f875c1d2e
amera2/CaptureRequest.cpp
d19d994770a04f02c204affd29985c5aeaa58baa 29-Aug-2016 Chih-Hung Hsieh <chh@google.com> Fix google-explicit-constructor warnings in camera.

* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I61f9b5b2b6e13e0c6561327bc8dfe69c9cfc5ba5
dk/impl/ACameraCaptureSession.h
dk/impl/ACameraDevice.h
dk/impl/ACameraManager.h
dk/impl/ACaptureRequest.h
7bc559a13c14acb3e74ffc08fd0d898b4d494d4d 12-Aug-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 70066d9 to stage-aosp-master am: 311f99eade
am: f671d5bbf8

Change-Id: I80d1494c33d33a5ebe784dd894148d90747ae726
311f99eade1222575bc65a2fcbd9f9a5a40d2024 12-Aug-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 70066d9 to stage-aosp-master

Change-Id: I9af1ace904388c91e6ce885e8a6d3540eb57bb4a
5404ee174dd6b5e312d3a97bc63c2bc8d142012b 09-Aug-2016 Chih-Hung Hsieh <chh@google.com> Fix clang-tidy warnings in camera.

* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: I71d3008da843ba5f1df1a73a320fb2af6ceffa16
Merged-In: I71d3008da843ba5f1df1a73a320fb2af6ceffa16
endorTagDescriptor.cpp
dc9e8bec5928ce0ee25fc532b74bf0a9a3bf65be 19-Jul-2016 Srinath Sridharan <srinathsr@google.com> Merge \"Making sure cameraserver can write into camera-daemon cpuset\" into nyc-mr1-dev
am: a72c2f7fa5

Change-Id: I0a48b3e384cc11e8a0febf04ccc36dcaac99d57a
a72c2f7fa55b79f8b5f787047ffd430fa5b89198 19-Jul-2016 Srinath Sridharan <srinathsr@google.com> Merge "Making sure cameraserver can write into camera-daemon cpuset" into nyc-mr1-dev
9959f5aa7e66764e6f2fc4325e7657fcc2776427 18-Jul-2016 Srinath Sridharan <srinathsr@google.com> Making sure cameraserver can write into camera-daemon cpuset

If multiple writepids, all must be in one line to take effect. Else,
only the last one will take effect.

bug: 30192722
bug: 28312446
Change-Id: Icbcdefec58346d5c7258b51055de96ec8de8dd65
ameraserver/cameraserver.rc
b4115063f468216510cb9265962b7fb942212e28 18-Jul-2016 Eino-Ville Talvala <etalvala@google.com> Camera3Device: Add dumpsys monitoring of request/result metadata
am: 4d453830b6

Change-Id: Iefb0f526d0d6d8d667fd1c3c3e4637db6624c276
4d453830b6a8fb7571a88a9a241eabd50a483c44 15-Jul-2016 Eino-Ville Talvala <etalvala@google.com> Camera3Device: Add dumpsys monitoring of request/result metadata

Add new -m dumpsys option to cameraservice dump for monitoring
changes in selected metadata values in requests and results.

This option takes a comma-separated list of metadata keys, or the
shortcut value "3a", which expands to all the "android.control" tags.

In subsequent dumpsys calls, the last 100 changes to the tags being
monitored are listed.

The monitoring must be turned on once the camera device is running.

Bug:
Change-Id: If8938b30611ccafa86c2c4a06e57fc72680f827b
ameraMetadata.cpp
endorTagDescriptor.cpp
84fd507c3dc666947811af5d5f134f7dbe9a09de 13-Jul-2016 Eino-Ville Talvala <etalvala@google.com> Merge \"Cameraserver: Remove unneeded groups\" into nyc-mr1-dev
am: f8e7b0a2fb

Change-Id: If7023a66c3f61315a326aeef2265f8bbb93e9b7c
091348e3ac3f2172d871bc6c140911d16b47c9dc 11-Jul-2016 Eino-Ville Talvala <etalvala@google.com> Cameraserver: Remove unneeded groups

The cameraserver doesn't need access to media, drm, etc, to
operate.

Leave drmrpc as it is required for JPEG encoding support on some
devices.

Bug: 28915212
Change-Id: I61c96739eafbb3e55be7e646390d74bd5e71a842
ameraserver/cameraserver.rc
d982ff18c7ccb1c35854e73947cdbe072eb57a38 11-Jul-2016 Tim Murray <timmurray@google.com> update stune group for cameraserver to top-app
am: 8fe99a6553

Change-Id: I5d26f7bde1f1c06b07aeadfb1ec475214a71173c
8fe99a6553ca6c307c0854fc7370c31c3f4abe94 11-Jul-2016 Tim Murray <timmurray@google.com> update stune group for cameraserver to top-app

bug 29512132

Change-Id: I1e7787ac8a401ad285816a11c422ddc6bfc98892
ameraserver/cameraserver.rc
85d42d4bd91b4622815ef80ef67377996ced572c 08-Jul-2016 Srinath Sridharan <srinathsr@google.com> Merge \"eas: Making cameraserver part of foreground stune cgroup\" into nyc-mr1-dev
am: 65f40e3a25

Change-Id: Ibf740b16b2198c1f257610583ca671acf3a69a02
bb9ec28513eb32acc7670bdf49a46bb538836cf3 08-Jul-2016 Srinath Sridharan <srinathsr@google.com> eas: Making cameraserver part of foreground stune cgroup

BUG: 28312446
Change-Id: I321fc2882b12f67ca5fd2a9839685343368d3a3f
ameraserver/cameraserver.rc
ead8201f18ced9e5c1e89243426206fe331d91bc 25-Jun-2016 Tim Murray <timmurray@google.com> Merge \"cameraserver: move cameraserver to the camera-daemon cpuset\" into nyc-mr1-dev
am: 36ff576ec7

Change-Id: Ic886c7c574bf99f568a5550730f64f75eda45456
982dfe2fe085c181c4eec9ccbe50bd0fdc04988b 24-Jun-2016 Tim Murray <timmurray@google.com> cameraserver: move cameraserver to the camera-daemon cpuset

cameraserver should be running in the camera-daemon cpuset, as it may
have different requirements than the foreground cpuset.

Change-Id: I1d201521a58a470497f762abd105609acf5fc02f
ameraserver/cameraserver.rc
405debd8aa344c4f8ab5fe45c525ed400851f877 03-Jun-2016 Zhijun He <zhijunhe@google.com> Merge "Camera3: add deferred surface support" into nyc-mr1-dev
am: d2958597bc

* commit 'd2958597bc86d7eab85f007997d8986e1542f7a4':
Camera3: add deferred surface support

Change-Id: I6d37d0ad9bcb25b13a45f3af3f4adeb7cb00dcf7
d2958597bc86d7eab85f007997d8986e1542f7a4 03-Jun-2016 Zhijun He <zhijunhe@google.com> Merge "Camera3: add deferred surface support" into nyc-mr1-dev
5d677d1f0879d5101e38df480a38228a64d63959 30-May-2016 Zhijun He <zhijunhe@google.com> Camera3: add deferred surface support

Initial native implementation and aidl changes for surfaceless support.

Bug: 28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
idl/android/hardware/camera2/ICameraDeviceUser.aidl
amera2/OutputConfiguration.cpp
aa9bc9c0bc27eab90b1b7f1d35d4273e990d6e62 02-Jun-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: fill in more NDK API documents" into nyc-dev am: b7444b1d60
am: 40687b3ab4

* commit '40687b3ab422020d1fd1e7acf4042590d649c385':
CameraNDK: fill in more NDK API documents

Change-Id: I59ff1a94bb7a5e21140a675e89e84a65bf85238a
165134a1dcdbdb0177d81b77bfdf08fe90cbbf2b 02-Jun-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: fill in more NDK API documents" into nyc-dev
am: b7444b1d60

* commit 'b7444b1d60b72f17e9627b3fe0d0af1a980e4d97':
CameraNDK: fill in more NDK API documents

Change-Id: I84ed3651471a9bfa7357682ef164d5ca83dd6461
40687b3ab422020d1fd1e7acf4042590d649c385 02-Jun-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: fill in more NDK API documents" into nyc-dev
am: b7444b1d60

* commit 'b7444b1d60b72f17e9627b3fe0d0af1a980e4d97':
CameraNDK: fill in more NDK API documents

Change-Id: Ie775b8cefc79b6c2c76ca90d9ba4e2948eb6d069
1d0955cb5257a59f0ae435fefe26c05af4f4fbb6 16-May-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: fill in more NDK API documents

This change adds document for ACaptureRequest, ACameraMetadata,
AImage and AImageReader.

Bug: 27102995
Change-Id: I79d88f73258c01ebeabcd5b4e3b90996759cb021
dk/impl/ACameraMetadata.h
d6bfa9025283d68695eb9220fa72ed323c38df45 24-May-2016 Zhijun He <zhijunhe@google.com> Merge "cameraserver: add input group" into nyc-mr1-dev
am: 21a1e4da4e

* commit '21a1e4da4e22db07abd88ed6d2326ff557911b5e':
cameraserver: add input group

Change-Id: I2d6aa9204af1f1d1c87b80bcca3a601073ea6447
fb36fd1da415212e5177c88426f78c39cc303586 24-May-2016 Zhijun He <zhijunhe@google.com> cameraserver: add input group

It is required by some input device node access.

Bug: 28914535
Change-Id: I863bfe6014b316c6e0113327f631555fcb0d28d3
ameraserver/cameraserver.rc
97cfe435fbb4f448b56521f7d9950ae03e9d14d3 19-May-2016 Ari Hausman-Cohen <arihc@google.com> Merge "Fix facing check in CameraUtils" am: 2f15fd50d8
am: 04005f2420

* commit '04005f2420397799ff3f61148146cf0c77b51e99':
Fix facing check in CameraUtils

Change-Id: I0e884e39663c919cb0329a599ebccbbdf28c7bb0
2f15fd50d812c1642d85b3d66252b187092fd68a 19-May-2016 Ari Hausman-Cohen <arihc@google.com> Merge "Fix facing check in CameraUtils"
d82147029a5f20c921a8134a030cdcca83841df7 19-May-2016 Ari Hausman-Cohen <arihc@google.com> Fix facing check in CameraUtils

One of the checks in CameraUtils::getRotationTransform
checked the wrong variable.

Change-Id: I365c1cf48d6b71468712da75c4499e00337b02d4
ameraUtils.cpp
f1fa4d6231b51f370c2112728f3eba5da262296f 13-May-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: remove unused error enum values" into nyc-dev
am: 3bb4a3026a

* commit '3bb4a3026a7f2774e1d6ea4eaed44599d55fde8a':
CameraNDK: remove unused error enum values

Change-Id: I27fab78cd56ea84a25951a7be11be37918433fa8
a22528a9fac1763810d21b899e1b8c7977ea224c 12-May-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: remove unused error enum values

and fill in documents for each error value.

Bug: 27102995
Change-Id: Ia44f87c09758f098442f894f4236ce8fa2ccffb3
dk/impl/ACameraDevice.cpp
7a967c72a635a8da670350da8e4672504fcdf586 09-May-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: add NDK API documents" into nyc-dev
am: 4cb010fb24

* commit '4cb010fb240a782571938a623aa34acd67814452':
CameraNDK: add NDK API documents

Change-Id: Iba29cfe613d1891d2b73b8aad710cbde8ce14bf2
4cb010fb240a782571938a623aa34acd67814452 09-May-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: add NDK API documents" into nyc-dev
3e49be17d8c8c53f50bb0d39affbbc36f6a12488 13-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: add NDK API documents

This change adds document for ACameraManager, ACameraDevice and
ACameraCaptureSession.

Bug: 27102995

Change-Id: I5706337e419cd533c1c7d46e412dc62bf7c726cb
dk/impl/ACameraManager.cpp
47734c9509ecb472c2844cae46e2d916b9358321 02-May-2016 Chih-Hung Hsieh <chh@google.com> resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp

Change-Id: Iae0a5cb698807d74ba28878d7ce1f69b6ba5219a
20be7bf5ba6f3d4db36686d5af4316006cf9bb27 02-May-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev
am: 9e23567ed0

* commit '9e23567ed02c30bb390ffe56b25f59b626cd9eab':
Camera: Fix passing video native handle for 64-bit app

Change-Id: I1bc16ac12f98f969ab9d54b43fdda90fc462c300
9e23567ed02c30bb390ffe56b25f59b626cd9eab 02-May-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev
2d13b1d3eeaba31d8c15acc6037fd68b150a9a66 28-Apr-2016 Chien-Yu Chen <cychen@google.com> Camera: Fix passing video native handle for 64-bit app

Add new binder calls to pass video native handle so the video native
handle can be passed between 32-bit and 64-bit processes.

Remove problematic code that used IMemory to pass video native
handle because the sizes of VideoNativeMetadata are different in
32-bit and 64-bit processes.

Bug: 28403412
Change-Id: I3341b1812ecc41d61846bb72ca926ecb1674c9ec
amera.cpp
ameraUtils.cpp
Camera.cpp
CameraClient.cpp
CameraRecordingProxy.cpp
CameraRecordingProxyListener.cpp
4c0d6da0073e33d1c88ed52481f430ad68bd73ea 28-Apr-2016 Martijn Coenen <maco@google.com> Merge "Move system services into correct cpusets." into nyc-dev
am: ecd0a41

* commit 'ecd0a41d9a2cc9efbc4ad6d4c91d417461772933':
Move system services into correct cpusets.

Change-Id: I752b8b857ca94be20160ddebfb041aab0cca5fca
ecd0a41d9a2cc9efbc4ad6d4c91d417461772933 28-Apr-2016 Martijn Coenen <maco@google.com> Merge "Move system services into correct cpusets." into nyc-dev
090ef604f81447eab4aa0a5b45d6307482573560 27-Apr-2016 Chih-Hung Hsieh <chh@google.com> Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I625fbab25f16282c2ea929cd16283d9d146fa17b
Camera.cpp
CameraClient.cpp
CameraRecordingProxy.cpp
CameraRecordingProxyListener.cpp
CameraService.cpp
CameraServiceListener.cpp
CameraServiceProxy.cpp
amera2/ICameraDeviceCallbacks.cpp
amera2/ICameraDeviceUser.cpp
58f3e5541361cb04d64b8ad6a676ad0d77a4ee57 15-Apr-2016 Martijn Coenen <maco@google.com> Move system services into correct cpusets.

To foreground:
- cameraserver
- mediaserver
- audioserver
- mediacodec
- drmserver
- mediadrmserver
- mediaextractor

Bug: 24949295
Change-Id: I182e5cf6fa4b33d87a0a2f77b0b03fa8d76b8e27
ameraserver/cameraserver.rc
06d47907bed5594198cfe7a5c7a89d5877625b58 16-Apr-2016 Chien-Yu Chen <cychen@google.com> Merge "Camera: Stop repeating request if its output is abandoned" into nyc-dev
am: 1c39c2b

* commit '1c39c2bd6780e858e0f36cfc58eac84ce88ef3ce':
Camera: Stop repeating request if its output is abandoned

Change-Id: I9bdd7a3ee21988a8e9ddf598603151e47220d51c
e8c535e833ed135895e99ca81aa3b85d80d7cf3c 14-Apr-2016 Chien-Yu Chen <cychen@google.com> Camera: Stop repeating request if its output is abandoned

Stop repeating request if any of its output stream is abandoned.
Add a callback to notify the repeating request has been stopped
with frame number of the last frame.

Update NDK with the new callback and behavior.

Bug: 21270879

Change-Id: I3553775c7807a77104aa1650609480ca3321310c
idl/android/hardware/camera2/ICameraDeviceCallbacks.aidl
idl/android/hardware/camera2/ICameraDeviceUser.aidl
dk/impl/ACameraDevice.cpp
dk/impl/ACameraDevice.h
ests/CameraBinderTests.cpp
d13559f49e6fecff860989f8d88b1fd6355a89f8 08-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNdk: add onBufferLost capture callback" into nyc-dev
am: 6a9d0da

* commit '6a9d0dac7a6e33a276b234375207a3037a41ca7a':
CameraNdk: add onBufferLost capture callback

Change-Id: I962e29b208c38ad1b2ea71751204be06f4b6c8b0
6a9d0dac7a6e33a276b234375207a3037a41ca7a 08-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNdk: add onBufferLost capture callback" into nyc-dev
44184038e95c8401999775333f2e8d2b5d9381c4 08-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge changes from topics \'cam-ndk-hidden-enum\', \'cam-ndk-enum-dco\', \'cam-ndk-hidden-keys\' into nyc-dev
am: 25e60f1

* commit '25e60f13bd3768e845e9e1caf92f44db1d1307f0':
CameraNDK: hide some capabilities in NDK
CameraNDK: add metadata enum value documents
CameraNDK: hide more NDK metadata tags

Change-Id: Ie0fb6d8049f41b3cdef13f05c6cc6c596385ee4e
25e60f13bd3768e845e9e1caf92f44db1d1307f0 08-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden-keys' into nyc-dev

* changes:
CameraNDK: hide some capabilities in NDK
CameraNDK: add metadata enum value documents
CameraNDK: hide more NDK metadata tags
e081c59aeb309f5d91b99c433fc252e4570d4db8 30-Mar-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNdk: add onBufferLost capture callback

Bug: 27102995
Change-Id: Ic54d1950da54c09eb2fea1eea5fccd3141c626d4
dk/impl/ACameraDevice.cpp
dk/impl/ACameraDevice.h
ff2a495cc65881caa25bae520f1249e92ceb9ac6 03-Apr-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: hide more NDK metadata tags

- Codegen update: some of hidden metadata keys should not be
disclosed in NDK.
- Also added capture result frame number plumbing.

Bug: 27102995
Change-Id: Ia238f95a4da726330205c53fc5d3f1f63d7553a1
dk/impl/ACameraDevice.cpp
dk/impl/ACameraMetadata.cpp
56ba086076f68a93a4340695750e5e870b7c6cce 31-Mar-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: implement abortCaptures API" into nyc-dev
am: 143d44b

* commit '143d44b6164f86c53f8778152d8c26697fbdaa38':
CameraNDK: implement abortCaptures API

Change-Id: Ic74f1bde0010acf5a8a9166ea5be4eb65fb8a23a
309d05d030903e7849affd60c58d4236147aa390 28-Mar-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: implement abortCaptures API

Bug: 27102995
Change-Id: Idaf1db02e0bcc60bb9cdb2797b4479ea0389f5f9
dk/NdkCameraCaptureSession.cpp
dk/impl/ACameraCaptureSession.cpp
dk/impl/ACameraCaptureSession.h
dk/impl/ACameraDevice.cpp
dk/impl/ACameraDevice.h
1c0e48076f569d5d5d732cb0c4fe8efa3334a741 21-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Fix openLegacy error codes" into nyc-dev
am: 8708e14

* commit '8708e14eba0c9f533c274f7067d744386e45b385':
Camera: Fix openLegacy error codes
3525dd92724e4942c9259f19581d63b93f18e14b 21-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Camera: Fix openLegacy error codes

Fix error handling regressions from the Binder interface refactor

- Error codes from openLegacy became incorrect
- Client initialize() call error codes were not discriminated between

Bug: 27657269
Change-Id: I2379d45d5fe5c2ad43c78bcfd18ea4c833adc987
amera.cpp
b95abe525127767dbf2c6b7f2055fbdc40f66f05 11-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera3: Add error stream ID for buffer drop errors" into nyc-dev
am: 97a330964b

* commit '97a330964b0548238d75602c74b290bea77a6b55':
Camera3: Add error stream ID for buffer drop errors
97a330964b0548238d75602c74b290bea77a6b55 11-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Merge "Camera3: Add error stream ID for buffer drop errors" into nyc-dev
5e1160febc2bef5196e0a9ea45a0bd9c7d6de707 07-Mar-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "CameraNDK: add API to list all tags in metadata" into nyc-dev
am: 13be06c383

* commit '13be06c383b883058a4202d4f2643ddf1937c078':
CameraNDK: add API to list all tags in metadata
8aac03f4d6c66749803d5708086ba5f509aa88c6 04-Mar-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: add API to list all tags in metadata

Bug: 27102995
Change-Id: I2807b94867f7ed32585afedbbff0a77a93c8fe94
ameraMetadata.cpp
dk/Android.mk
dk/NdkCameraMetadata.cpp
dk/NdkCaptureRequest.cpp
dk/impl/ACameraDevice.cpp
dk/impl/ACameraMetadata.cpp
dk/impl/ACameraMetadata.h
e95bb6312b972117a0ee70eabf78fcd118018f61 07-Mar-2016 Eino-Ville Talvala <etalvala@google.com> Camera3: Add error stream ID for buffer drop errors

To enable passing buffer drop errors to API users

Bug: 24168122
Change-Id: I2769d0ba1fbd9a09494d5904eac511cecea3e6a8
aptureResult.cpp
6bbf3a15bcba7bed60b83c3b589332f0d1a02a63 04-Mar-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: prevent double closing session
am: 085dd0935c

* commit '085dd0935c9cd19791a9a58a4df4a05e29eadca7':
CameraNDK: prevent double closing session
085dd0935c9cd19791a9a58a4df4a05e29eadca7 02-Mar-2016 Yin-Chia Yeh <yinchiayeh@google.com> CameraNDK: prevent double closing session

Bug: 27102995
Change-Id: Ie3e9870d1fc1025cab7a1019ed7d056fe07536ad
dk/impl/ACameraCaptureSession.cpp
dk/impl/ACameraCaptureSession.h
0492686c4703b3ddbff52d047ef226b973a3388a 03-Mar-2016 Eino-Ville Talvala <etalvala@google.com> resolve merge conflicts of 6e0c00ba53 to nyc-dev-plus-aosp

Change-Id: I123a42e8cd1439177ea75a3c0aba7dca0b2f31fe
02bf03287652923b5bb5316667b065423565d6b4 18-Feb-2016 Eino-Ville Talvala <etalvala@google.com> Camera: Clean up warnings and set -Werror

- Also fix error logging template inconsistency
- Also add a few error handling cases into camera2 NDK
to deal with previously-ignored error codes

Bug: 27149500
Change-Id: I8f1f4c72252dd48d652f24b595b642199f20c327
ndroid.mk
ameraBase.cpp
ameraParameters2.cpp
endorTagDescriptor.cpp
amera2/OutputConfiguration.cpp
ameraserver/Android.mk
dk/Android.mk
dk/impl/ACameraDevice.cpp
dk/impl/ACameraManager.cpp
ests/Android.mk
d56db1d2bee182d1851097a9c712712fc094d117 18-Dec-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Switch camera2 to auto-gen C++ binder interfaces

- Move camera service AIDL files to frameworks/av
- Build C++ interface stubs with AIDL tools
- Add necessary native-side parcelables and update existing ones
- Remove manually-written stubs, rearrange remaining manual stubs
- Adjust implementations to work with auto-generated stubs
- Adjust method signatures for auto-gen differences
- Add rich error messages using binder::Status

Bug: 25091611
Change-Id: I6f69f34b9d1a3f8d1fb7db87357363f8fa8483ff
ndroid.mk
amera.cpp
ameraBase.cpp
ameraMetadata.cpp
aptureResult.cpp
Camera.cpp
CameraClient.cpp
CameraService.cpp
CameraServiceListener.cpp
endorTagDescriptor.cpp
idl/android/hardware/CameraInfo.aidl
idl/android/hardware/ICamera.aidl
idl/android/hardware/ICameraClient.aidl
idl/android/hardware/ICameraService.aidl
idl/android/hardware/ICameraServiceListener.aidl
idl/android/hardware/ICameraServiceProxy.aidl
idl/android/hardware/camera2/CaptureRequest.aidl
idl/android/hardware/camera2/ICameraDeviceCallbacks.aidl
idl/android/hardware/camera2/ICameraDeviceUser.aidl
idl/android/hardware/camera2/impl/CameraMetadataNative.aidl
idl/android/hardware/camera2/impl/CaptureResultExtras.aidl
idl/android/hardware/camera2/params/OutputConfiguration.aidl
idl/android/hardware/camera2/params/VendorTagDescriptor.aidl
idl/android/hardware/camera2/utils/SubmitInfo.aidl
amera2/CaptureRequest.cpp
amera2/ICameraDeviceCallbacks.cpp
amera2/ICameraDeviceUser.cpp
amera2/OutputConfiguration.cpp
amera2/SubmitInfo.cpp
ameraserver/Android.mk
dk/Android.mk
dk/NdkCameraManager.cpp
dk/impl/ACameraDevice.cpp
dk/impl/ACameraDevice.h
dk/impl/ACameraManager.cpp
dk/impl/ACameraManager.h
ests/Android.mk
ests/CameraBinderTests.cpp
ests/VendorTagDescriptorTests.cpp
28ace6b191453091569c223a442776694cf3a895 13-Feb-2016 Dimitry Ivanov <dimitry@google.com> Merge "Add missing liblog dependency"
am: 4be8e17981

* commit '4be8e17981171d14daa71ff74c538ec41d265497':
Add missing liblog dependency
cdf15736da5d623948df6586118d5a7d0df3e809 13-Feb-2016 Dimitry Ivanov <dimitry@google.com> Add missing liblog dependency

Bug: http://b/27171986
Change-Id: Iacceec85de8a64d1f28724ba6c4d6eab34d865a0
ests/Android.mk
feb76cc0340f3eb4c9ae91cbfab4dcea449422f5 28-Jan-2016 Chien-Yu Chen <cychen@google.com> Merge changes from topic 'camera-hardening'

* changes:
camera: Add support to pass native handles across binders
Camera: Fix client permission check
Add cameraserver process
aeead926245c1d1a4fa76a050be915288d0b32f1 27-Jan-2016 Yin-Chia Yeh <yinchiayeh@google.com> Merge "NDK: AImageReader implementation"
c360382bf257d815b2a411152485d3c3b37a9f46 19-Jan-2016 Yin-Chia Yeh <yinchiayeh@google.com> NDK: AImageReader implementation

Bug: 23012001
Change-Id: I14341de141e6fc5817f397e849af35ccdb80d644
dk/Android.mk
dk/impl/ACameraMetadata.cpp
dk/impl/ACameraMetadata.h
d8f9a713f3462ef8ac41c0d02aa90efc29cb33c7 27-Jan-2016 Yin-Chia Yeh <yinchiayeh@google.com> Camera NDK: fix build break

On devices still using gcc

Change-Id: Ideb1a054d753194569513362f5b1fb80446eaf82
dk/Android.mk
6773d4777f4ccbbe6377e4ae1b42c117066ae6ba 13-Jan-2016 Praveen Chavan <pchavan@codeaurora.org> camera: Add support to pass native handles across binders

If the video buffer contains a native handle, serialize and
deserialize it properly.

Author: spodder@codeaurora.org
Bug: 26268807
Change-Id: I1905be81e2045667e00c95ab75d1bf144756b894
ndroid.mk
ameraUtils.cpp
Camera.cpp
CameraClient.cpp
CameraRecordingProxy.cpp
CameraRecordingProxyListener.cpp
98a668f6ea51e4d894d2ebb61a0e18287fb14008 18-Dec-2015 Chien-Yu Chen <cychen@google.com> Camera: Fix client permission check

Modify StageFright's CameraSource to forward calling PID as
client PID when connecting to CameraService so CameraService
can check if the client PID has permission to use camera.

Change CameraService to check calling UID is trusted before
using the passed in client PID and client UID to verify permission.

Bug: 24511454
Change-Id: I4906ab73510e2c75714690bed675e3c13aca3ccf
amera.cpp
ameraBase.cpp
CameraService.cpp
ead9146f844ee194a4f4244ba8ae1a3aece12b63 07-Jan-2016 Yin-Chia Yeh <yinchiayeh@google.com> Camera NDK library: capture session implementation

Bug: 23012001
Change-Id: I3fd93205dcf1b9ed5a947cb944919eb531f219fc
dk/Android.mk
dk/NdkCameraCaptureSession.cpp
dk/NdkCameraDevice.cpp
dk/NdkCameraManager.cpp
dk/NdkCameraMetadata.cpp
dk/NdkCaptureRequest.cpp
dk/impl/ACameraCaptureSession.cpp
dk/impl/ACameraCaptureSession.h
dk/impl/ACameraDevice.cpp
dk/impl/ACameraDevice.h
dk/impl/ACameraManager.cpp
dk/impl/ACameraMetadata.cpp
dk/impl/ACameraMetadata.h
0dea57fd9fc4b2ccaab97d9477359fbd5a626f5c 10-Dec-2015 Yin-Chia Yeh <yinchiayeh@google.com> Camera NDK library: first draft

Bug: 23012001

Change-Id: I06d834421289d4dead1c87301a6ee94487ccf023
dk/Android.mk
dk/NdkCameraCaptureSession.cpp
dk/NdkCameraDevice.cpp
dk/NdkCameraManager.cpp
dk/NdkCameraMetadata.cpp
dk/NdkCaptureRequest.cpp
dk/impl/ACameraDevice.cpp
dk/impl/ACameraDevice.h
dk/impl/ACameraManager.cpp
dk/impl/ACameraManager.h
dk/impl/ACameraMetadata.cpp
dk/impl/ACameraMetadata.h
dk/impl/ACaptureRequest.h
ests/CameraBinderTests.cpp
1f36e3b27abfb16bc5e788e253d367eff4886dba 04-Dec-2015 Chien-Yu Chen <cychen@google.com> Add cameraserver process

Move camera service from mediaserver to cameraserver.

Bug: 24511454
Change-Id: I9a818c2786ade304777c44b3536f18ee9cd2a6f7
ameraserver/Android.mk
ameraserver/cameraserver.rc
ameraserver/main_cameraserver.cpp
018107a82d80f186d3efca250e38e9c85436a4d9 19-Jan-2016 Zhijun He <zhijunhe@google.com> camera: Add surface set ID to OutputConfiguration

Bug: 25088440
Change-Id: I95153522b8b1f3ec4c98800b94a95fe7782c9205
amera2/OutputConfiguration.cpp
8cca0750a84c2d97224c0cfef7cf255308ee80b3 14-Nov-2015 Chien-Yu Chen <cychen@google.com> Camera: Support BufferQueue between Camera and StageFright

Use a BufferQueue between Camera and StageFright to pass video
buffers for Camera HALv3 devices.

CameraSource in StageFright will try to use "buffer queue" mode
if it is supported by the camera device. In "buffer queue" mode,
CameraSource creates a buffer queue and a listener thread to recieve
video buffers from camera device. CameraSource then wraps the
ANWBuffer in MediaBuffer. If the camera device doesn't support
"buffer queue" mode, it falls back to "metadata in video buffer"
mode or "real YUV data" mode.

"Metadata in video buffer" mode is removed from Camera2Client and
only "buffer queue" mode is supported.

Bug: 24511454

Change-Id: Ice833b57bcd8d91852d6415402013f56f3e3970a
amera.cpp
Camera.cpp
d309fb9c8a2c4564d88fffba19c4e3688e4b862b 25-Nov-2015 Eino-Ville Talvala <etalvala@google.com> CameraService: Remove device HALv2 support, other cleanup

HALv2 only ever shipped with Nexus 10, and has been fully superceded by
HALv3. Remove it to allow for various code simplifications and cleanup.

- Remove Camera2Device
- Remove various special-case codepaths for supporting Camera2Device
- Remove CameraDeviceFactory, since it only creates Camera3Devices now
- Remove BurstCapture and associated CaptureSequence/Parameters code
- Remove old ZslProcessor and simplify ZslProcessor hierarchy to be
just ZslProcessor3, which is renamed to just ZslProcessor
- Add service-init-time check for unsupported device versions
- Fix assorted compiler warnings, some old, some new
- Remove references to HALv2 when possible

Bug: 25866588
Change-Id: Ia1063264d315f9b742ec5cdd0483539310894f5e
ests/CameraBinderTests.cpp
412fe56cd7cf7d73bc5d2bcc3f635bc650d18de9 21-Aug-2015 Eino-Ville Talvala <etalvala@google.com> CameraService: Notify camera service proxy of device status

Send the camera proxy service in system server updates to
camera device state: opened/closed/active/idle.

Bug: 23393557
Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
CameraServiceProxy.cpp
5d1103e5a229401a4c4e0cb7dd91b2742881ff92 17-Aug-2015 Ruben Brunk <rubenbrunk@google.com> Merge "Add experimental camera session prepare API." into mnc-dr-dev
c78ac26e3a65328fc0118f16ee76a800d0687eb7 14-Aug-2015 Ruben Brunk <rubenbrunk@google.com> Add experimental camera session prepare API.

Bug: 18949148
Change-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82
amera2/ICameraDeviceUser.cpp
bad4358c83c7daaf9eeb8542c15eea4f473c884c 14-Aug-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Add camera type to ICameraService.getNumberOfCameras.

Also determine the number of 'normal' cameras present on
camera service startup, and ensure that all normal cameras have
IDs lower than the 'strange' cameras.

Bug: 23194168
Change-Id: I1f7b14825cb52707de698a955f85da1eaa932663
CameraService.cpp
e2b60c810282b7cd09af8544dd479ff5adba46f0 18-Jul-2015 Eino-Ville Talvala <etalvala@google.com> CameraMetadata: Add sanity check to avoid accidental memory corruption.

Update shouldn't be called with a pointer from the metadata structure
being updated, since it might be resized. The API really needs rework,
but until that happens, detect this condition and error out.

Bug: 22542551
Change-Id: I896c34d8134ac3b101d050fc8aa5d203a08e7267
ameraMetadata.cpp
b25e3c87724b6147ed1da7c1d6617c39bfce2fbf 16-Jul-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Add hidden experimental tearDown method.

Bug: 18949148
Change-Id: Ie86ec7d1ec3db54e1154563b2339a208a935f849
amera2/ICameraDeviceUser.cpp
3450ba7879be6522ea46a56c5e66e5382f5dd5ba 16-Jun-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Fix native binder interface and add tests.

- Add CameraBinderTests for limited coverage of native
camera2 binder interfaces for the camera service.
- Fix several bugs in the native binder interfaces.

Bug: 18468810
Change-Id: Iab2d81a5cacd20daf7454aeeed033cc13d88452c
CameraService.cpp
CameraServiceListener.cpp
amera2/ICameraDeviceUser.cpp
amera2/OutputConfiguration.cpp
ests/Android.mk
ests/CameraBinderTests.cpp
ests/VendorTagDescriptorTests.cpp
d16a8ef26fd1f7a86061c396c5865564af2f1abb 06-Jun-2015 Jeff Brown <jeffbrown@google.com> Merge "Update signature of writeBlob." into mnc-dev
e3afb2cc438b76ae433c8c40ceabf0457ad7a678 04-Jun-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Change error for app ops reject, propagate binder errors

INVALID_OPERATION surfaces as an non-specific device-level error to
applications in the onError callback. This is not a condition apps
targeting camera2 in L will generally have to deal with.

Instead, return -EACCESS which maps to throwing
CameraAccessException.CAMERA_DISABLED, same as disabling camera access
with DevicePolicyManager.

The old camera API converts any error code to -EACCESS at the JNI layer,
so this doesn't change anything for the older API.

Also update the various native ICameraService binder connect calls to
check for the transact error code, and return it if it is not OK.
Without this, PERMISSION_DENIED transact errors from the camera
service cannot be distinguished from CAMERA_DISABLED errors in
some codepaths.

Bug: 21604925
Change-Id: Ifccc8989b8c20653429e2d3e51dba7abb2be9c35
amera.cpp
CameraService.cpp
e8df539988b307fa7d2ccd1a80be7553a502ae30 06-Jun-2015 Jeff Brown <jeffbrown@google.com> Update signature of writeBlob.

Bug: 21428802
Change-Id: Iec7e72369989a7c769be6169ead8afae8fe33b67
ameraMetadata.cpp
1fa8999c91d5df81949aa723000058380cd3faa2 02-Jun-2015 Zhijun He <zhijunhe@google.com> Camera2: implement high speed video APIs

Bug: 21442271
Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
amera2/ICameraDeviceUser.cpp
2232aee25e4df7d04446912e8ad9e9dc44d8ec16 20-May-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev
2823ce0ce6f9d508a07de20912c93cce9165027f 20-May-2015 Ruben Brunk <rubenbrunk@google.com> camera: Add AIDL interface for CameraServiceProxy.

- Adds an AIDL interface to allow the proxy camera service
running in system server to accept RPCs from the camera
service running in mediaserver.
- Request an update to the valid user set from the proxy
camera service when mediaserver restarts to initialize
properly + avoid DOS after a crash.

Bug: 21267484

Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
ndroid.mk
CameraServiceProxy.cpp
8eddd88568fe4da0ca0ceab5072bc488827f01b5 19-May-2015 Chih-Hung Hsieh <chh@google.com> Use memset to initialize dynamic array.

clang/llvm rejects
int32_t events[len] = {};.

BUG: 21269094
Change-Id: I0257bfbb72f1b49913baba0164d5a3a7976c452d
CameraService.cpp
6267b539d0d1ee7118aafd976d75cb8db397bc24 01-May-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Fix work-profile eviction handling.

Bug: 20124384
Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
CameraService.cpp
280405a138a0068694f3c39b4290f510173133d9 12-May-2015 Svetoslav Ganov <svetoslavganov@google.com> Revert "Add camera app op - camera"

This is not needed duplication of work

This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9.

Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
amera.cpp
ameraBase.cpp
CameraService.cpp
32fa6d0e65dbf956e253a1006e9419dce2fe75c9 02-May-2015 Svet Ganov <svetoslavganov@google.com> Add camera app op - camera

Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
amera.cpp
ameraBase.cpp
CameraService.cpp
4d44cad22ea925a651463f2d51d6586c14d4b787 11-Apr-2015 Eino-Ville Talvala <etalvala@google.com> Camera2: Add prepare for output streams

The prepare call asynchronously pre-allocates buffers for a given
output stream, and then fires the onPrepared callback.

Not implemented for Camera2Device or used in Camera2Client.

Change-Id: I1cccdfff846dd6985133c591dbdceed823929ade
amera2/ICameraDeviceCallbacks.cpp
amera2/ICameraDeviceUser.cpp
618ff8a48a0c895a78f91f5692510c2a809425c3 13-Mar-2015 Chien-Yu Chen <cychen@google.com> camera2: add reprocess support

Add support to create input stream, submit reprocess capture requests,
and receive reprocess capture results.

Change-Id: Iee2d4313f3d52616a484eaea7a28f5ef9d8a674b
amera2/CaptureRequest.cpp
amera2/ICameraDeviceUser.cpp
36597b241c59eba7e55d5150092947a748c5e9cb 21-Mar-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Enforce client eviction on user switch.

Bug: 19186859
Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
CameraService.cpp
525907aa2cf2148186ed55e47e424395b9a43dca 25-Mar-2015 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera: fix metadata assertion"
54298b338cf9f782f2ac681a15e6cbbb99649350 25-Mar-2015 Yin-Chia Yeh <yinchiayeh@google.com> Camera: fix metadata assertion

Bug: 19897963
Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
ameraMetadata.cpp
9efdf956cc2eef63fef609375901d6c8df6351b6 19-Mar-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Remove ProCamera.

Bug: 19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
ndroid.mk
ameraBase.cpp
CameraService.cpp
ProCameraCallbacks.cpp
ProCameraUser.cpp
roCamera.cpp
ests/Android.mk
ests/ProCameraTests.cpp
ae21e335e392125168601dba4731c85b5c25f33f 19-Mar-2015 Yin-Chia Yeh <yinchiayeh@google.com> Merge "Camera: plumbing rotation field through"
d58b2ac7244a964caa3f4e386b8280ae2f5d2125 19-Mar-2015 Ruben Brunk <rubenbrunk@google.com> Merge "camera2: Add camera client eviction enforcement."
cc776718c0be7c31fe5ab4fc1446d377be60369f 18-Feb-2015 Ruben Brunk <rubenbrunk@google.com> camera2: Add camera client eviction enforcement.

- This updates the CameraService to implement client
eviction behavior based on process priority.

Bug: 19186859

Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
ameraParameters.cpp
b97babb8c08969b55af3b6456d15f764c8873d3f 12-Mar-2015 Yin-Chia Yeh <yinchiayeh@google.com> Camera: plumbing rotation field through

Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
ndroid.mk
amera2/ICameraDeviceUser.cpp
amera2/OutputConfiguration.cpp
3d82c0d9ed2b3e956ad699a9ca2c8a70c9d24678 24-Feb-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Wire up dataSpace, clean up ICameraDeviceUser

- Remove unused arguments from ICameraDeviceUser::createStream
- Add dataSpace as a stream parameter, plumb it through everything

Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
amera2/ICameraDeviceUser.cpp
9a4fa2dfb7ce565fabfb7a7bef4f4adfea191f05 20-Feb-2015 Eino-Ville Talvala <etalvala@google.com> Merge "Camera: Remove RAW_SENSOR in favor of RAW16"
a97dfeb91aae9569ff11a5a40634e2960c03915e 20-Feb-2015 Eino-Ville Talvala <etalvala@google.com> Camera: Remove RAW_SENSOR in favor of RAW16

Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
ameraParameters.cpp
ests/ProCameraTests.cpp
3068d73c6c7e1f44523b1466b903a9c82408b258 09-Feb-2015 Chien-Yu Chen <cychen@google.com> camera: implement flashlight control

Implement flashlight API for module v2.4 by calling module APIs and
by for hal v2 and v3 by using CameraDeviceBase.

Bug: 2682206
Change-Id: Ib8b77f6fd462489d672f27e14fe37801d35b7544
CameraService.cpp
CameraServiceListener.cpp
ests/ProCameraTests.cpp
f6b1396150ed55fa9829e31f11533cd65c61d914 03-Feb-2015 Eino-Ville Talvala <etalvala@google.com> am 81898637: am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser methods to return correct result."

* commit '8189863774bd479f0060bbe1e4ce74dadcfc55c3':
camera2: fix various BpCameraDeviceUser methods to return correct result.
19fa0feaef631f92ab812cd1640252ade5fae1a2 02-Feb-2015 John Lin <jolin@mozilla.com> camera2: fix various BpCameraDeviceUser methods to return correct result.

- submitRequest*(): res is the request ID and not always equals to NO_ERROR.
- cancelRequest() and flush(): the result of reading last frame number should be put in resFrameNumber, not in res.

Change-Id: Ic81c58f4ac14c05b3db4bdc5c99f48d00665d3fc
Signed-off-by: John Lin <jolin@mozilla.com>
amera2/ICameraDeviceUser.cpp
6b6d8a79ef821541a7687ed924959369f73fc977 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-dev

* commit 'ffa3e71e47215b68fe4ae0b7a3f976db648d63d3':
Camera2: Fix CameraParameters parse segfault.
bc0f452b9a76dd8c8244e775bc9c5aa85cae3ddf 21-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-dev
5fc21ebe222505e3d89c5f2f5e2ec3fcdbd0b732 21-Nov-2014 Chien-Yu Chen <cychen@google.com> am c2d88d0b: am f4ea51fd: Merge "camera2: fix an error reading a NULL string" into lmp-mr1-dev

* commit 'c2d88d0b1571c11187e32b94e281ded17606070f':
camera2: fix an error reading a NULL string
5fc9d902510ccd04db80e0bc6aa679a4317a51b2 20-Nov-2014 Ruben Brunk <rubenbrunk@google.com> Camera2: Fix CameraParameters parse segfault.

Bug: 18331142
Change-Id: I41feec93f753f97b3e6bf963deb4a42b73406421
ameraParameters.cpp
7bc4fc847770d399d7c4a7afee5aa58b94f3b897 20-Nov-2014 Chien-Yu Chen <cychen@google.com> camera2: fix an error reading a NULL string

Handle the case where the surface name isn't set.

Bug: 10461464
Change-Id: I3ee233a7a5f6489513e6d87241cda2aaefbfd43b
amera2/CaptureRequest.cpp
77e79a509d19ab50b1867fe3903b5a8fae450591 17-Nov-2014 Marco Nelissen <marcone@google.com> resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp

Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
f888020c6e2735624f2b2a30e72aca24e17b8b4d 14-Nov-2014 Marco Nelissen <marcone@google.com> Update calls to IInterface::asBinder()

to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a

Conflicts:
media/libmedia/IAudioFlinger.cpp
media/libmedia/IMediaPlayer.cpp
media/libstagefright/CameraSource.cpp
amera.cpp
ameraBase.cpp
Camera.cpp
CameraClient.cpp
CameraRecordingProxy.cpp
CameraRecordingProxyListener.cpp
CameraService.cpp
ProCameraUser.cpp
amera2/CaptureRequest.cpp
amera2/ICameraDeviceUser.cpp
6e48af3d909568ed2f07b79369d52f9415100208 11-Nov-2014 Eino-Ville Talvala <etalvala@google.com> am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on NULL interfaces"

* commit '7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731':
Camera: Guard against asBinder() calls on NULL interfaces
e992e75053e98e3699af6e344c11b787e30411ad 08-Nov-2014 Eino-Ville Talvala <etalvala@google.com> Camera: Guard against asBinder() calls on NULL interfaces

Bug: 18207548
Change-Id: I9879c9b4c0282a6b96b77398f62beedc47f7f0a0
Camera.cpp
588fac9af56f778652265b24e57e3976fc7b0311 04-Nov-2014 Gaurav Batra <gbatra@nvidia.com> am 0c629a38: camera: fix vendortags section malloc failure
automerge: 8d55aa3

* commit '8d55aa31abe6d3db7693c6a49d9471f06c586c41':
camera: fix vendortags section malloc failure
0c629a3857c31bee6fa39ba7a9a8cbcabeb383fd 01-Nov-2014 Gaurav Batra <gbatra@nvidia.com> camera: fix vendortags section malloc failure

size_t type variables should be initialized properly especially on 64-bit archs
if they are type casted to shorter datatypes for some operation and then later
used in entirety. The results may be unpredictable since the most significant
bytes may contain garbage.

Bug 18222311

Change-Id: Iced82e964cf8c98f6856d257fc1534a5237a9064
endorTagDescriptor.cpp
bd014b81ef227752150bdbd1bb6a235db09f3616 12-Sep-2014 Dan Albert <danalbert@google.com> am fe80b7ee: am 6bf7c5cf: Merge "Clean up test makefiles."

* commit 'fe80b7ee58b394b0cd958470aeea3c5a09f6b2bf':
Clean up test makefiles.
0cb2c99f70dec2e4b93b72de9b433f2919c1540e 09-Sep-2014 Dan Albert <danalbert@google.com> Clean up test makefiles.

The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.

Change-Id: I6ac66c2f4e97cd3c55efb7a85e10922420554e7f
ests/Android.mk
ests/main.cpp
b3afa1e3c2af242e0d31a7619713b170d43c7e88 21-Aug-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Fix CameraUtils orientation for front camera.

Bug: 16637957
Change-Id: If6d213794a92eb60b8a333546670ca868b75e5fc
ameraUtils.cpp
0b88a62d4d5ac1e515721e587cdf9bcec191812b 19-Mar-2014 Igor Murashkin <iam@google.com> camera: Fix setParameters for Preview FPS single/range values

As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.

CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.

Bug: 12609188
Bug: 16654949
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
ndroid.mk
ameraParameters2.cpp
0ccba97ebec0e0c5a20f8859ebac03d5fd14c97f 29-Jul-2014 Eino-Ville Talvala <etalvala@google.com> Camera2: Fix transforms for front-facing cameras

Mirror, mirror on the wall, who is the best rotated of them all?

Also, use consistent enum names.

Bug: 16637957
Change-Id: Ie211d3b57b9e7d01122192ad03b73ceba5bf1bd3
ameraUtils.cpp
204e3295e2814052aef7e45ee9edd60128efbbd0 15-Jul-2014 Zhijun He <zhijunhe@google.com> Camera HAL3: migrate from partial quirks to partial result

- Enable the normal partial result path for HAL3.2, the quirk is only used
for the HAL version lower than HAL3.2. The partial quirks is no longer supported
for HAL3.2 or higher versions.
- Add CameraDeviceBase getDeviceVersion API.
- Fix some build warnings

Change-Id: I7a1b03d4d5fd5258d2addfba4368bee2ba691337
aptureResult.cpp
5698d4461a260dbf208484383f692b03c6473e74 18-Jun-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Set orientation flags for hardware composer.

Bug: 15116722
Change-Id: I3fcc9aea38afcbd665f86c511a9929fe9a6a3a8f
ndroid.mk
ameraUtils.cpp
b10cdadf0fb945e23ca77008d4af76584bd0e39a 17-Jun-2014 Zhijun He <zhijunhe@google.com> cameraservice: Implement HAL1 and higher HAL API coexistence

A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.

Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
amera.cpp
CameraService.cpp
65d14b9825311f9d1847cf282bd0419e71bac666 17-Jun-2014 Igor Murashkin <iam@google.com> camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService

Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
CameraService.cpp
6415ef3f791a0f4032af250e3b5e11f0e6289a2e 11-Jun-2014 Mark Salyzyn <salyzyn@google.com> am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue"

* commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1':
libcamera_client: 64-bit compile issue
1a93f0cbb99fc5a59c92bd913f29409022ae236d 10-Jun-2014 Mark Salyzyn <salyzyn@google.com> libcamera_client: 64-bit compile issue (part deux)

- %p print warning message
- size_t print warning messages
- unused parameter warning messages

Change-Id: I5de3564b27c65fe1a27c0bcc18ac1b72fca040e2
ameraMetadata.cpp
endorTagDescriptor.cpp
7b73e7127dc727e78460c92ca4115ccad87cf321 10-Jun-2014 Mark Salyzyn <salyzyn@google.com> libcamera_client: 64-bit compile issue

- size_t print format
- some unused parameter warning messages

Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
ameraBase.cpp
ameraParameters.cpp
ce8ae0f62a01cb3a390812db47bb08f29a8aee0d 22-May-2014 Ruben Brunk <rubenbrunk@google.com> Merge "cameraservice: Fix ICameraDeviceUser aidl order."
29478402ba0683323b7c7ff4843c8c2a4f0673d5 22-May-2014 Ruben Brunk <rubenbrunk@google.com> cameraservice: Fix ICameraDeviceUser aidl order.

Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75
amera2/ICameraDeviceUser.cpp
87cebadd48710e42474756fc3513df678de045ce 22-May-2014 Elliott Hughes <enh@google.com> resolved conflicts for merge of f285c91e to master

Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
b2119af7f4ced0ecfefd4c7388f86b4e3a3ea7d8 10-May-2014 Ruben Brunk <rubenbrunk@google.com> camera2: Update CameraService for HAL1 shim.

Updates the camera service to handle shim connections.

Changes include:
- Adds begin/end configure binder calls.
- Adds cache for shim client static camera metadata.
- Implements basic getCameraCharacteristic functionality for shim clients.

Bug: 15116722
Bug: 15117269

Change-Id: I510c5888ca15f8e7d3b8ed1680ff1c7f8f514744
ndroid.mk
ameraParameters.cpp
amera2/ICameraDeviceUser.cpp
9181b9f4bb53af203c090eff6d1af67d1f7c8770 12-May-2014 Zhijun He <zhijunhe@google.com> Camera: Don't enable log spew by default for eng build

Also replace assert with LOG_ALWAYS_FATAL_IF.

Change-Id: I528b97d9bc7a93dc3575ded28f6bf7e294d0a1e6
ndroid.mk
endorTagDescriptor.cpp
f81648ec38ff63f1f35516fa27c1c24d846e9ba5 18-Apr-2014 Ruben Brunk <rubenbrunk@google.com> camera3: Update CameraMetadata vendor tag handling.

Bug: 12134423
Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
ndroid.mk
endorTagDescriptor.cpp
6770260f83f5576b041b7b3a2536d082a631f9b0 03-May-2014 Ruben Brunk <rubenbrunk@google.com> Revert "camera3: Update CameraMetadata vendor tag handling."

This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363.

Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
ndroid.mk
endorTagDescriptor.cpp
4764324d2704f1b08bb7407014bf203924ff2363 18-Apr-2014 Ruben Brunk <rubenbrunk@google.com> camera3: Update CameraMetadata vendor tag handling.

Bug: 12134423
Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
ndroid.mk
endorTagDescriptor.cpp
cb0652e5a850b2fcd919e977247e87239efaf70e 13-Mar-2014 Jianing Wei <jianingwei@google.com> CameraService: trigger appropriate callbacks for burst capture.

* Instead of tracking CameraMetadata only, now we track both
CameraMetadata and CaptureResultExtras, which is not part of
the HAL metadata. This will enable the correct callback of
onCaptureStarted and onResultReceived given burst requests.

* Get last frame number in reply when submitting requests,
canceling requests, and flushing device. For repeating requests,
this frame number is the last frame number of the previous
request. For non-repeating requests, this frame number is the
expected last frame number of the current request. The goal
is provide frame number to Java side in order to trigger
onCaptureSequenceCompleted correctly.

* Fix notifyError so that onDeviceError can be called correctly.

Bug: 10749500
Change-Id: I2f3dda6c530090055d4a2ff9f0f087bbbe8d9257
ndroid.mk
aptureResult.cpp
amera2/ICameraDeviceCallbacks.cpp
amera2/ICameraDeviceUser.cpp
7595c47b4842d76dba0fcf26ef3ab98d215efe1e 28-Mar-2014 Zhijun He <zhijunhe@google.com> CameraMetadata: Fix String tag update null character issue

String8.size() doesn't count the null character in whatever case. But camera
metadata tag android.jpeg.gpsProcessingMethod need a null-terminited string.

Bug: 13679912
Change-Id: I91e742702b16b9ab9b42f9822de189a9a96e8e53
ameraMetadata.cpp
1cebdb77323e4554a316b9c34bf36957b7dad5ae 26-Mar-2014 Eino-Ville Talvala <etalvala@google.com> Revert "camera: Fix setParameters for Preview FPS single/range values"

Causes a regression on some devices, so reverting until we're in a position to fix those devices.

This reverts commit 9078a1b3b9f9c0c48046ade0e8e18b0d79a659db.

Bug: 13563098
Change-Id: I7aedd01fde8b8fdee77e972ec395f0ecadbf8ccb
ameraParameters.cpp
c3dcf1007aa964f825b2ea2ef86acb7f332e748f 25-Mar-2014 Igor Murashkin <iam@google.com> am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

* commit '65550a0e17852fe657795508e3bf05bdbfb2520b':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
91820d46b5f3065c2fded3cdf65d305715b33bb1 25-Mar-2014 Igor Murashkin <iam@google.com> am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

* commit '0370be96e33ea0c8fb4069e704deccce43b7403c':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
0370be96e33ea0c8fb4069e704deccce43b7403c 19-Mar-2014 Igor Murashkin <iam@google.com> DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.

CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.

Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
ndroid.mk
ameraParameters2.cpp
9078a1b3b9f9c0c48046ade0e8e18b0d79a659db 19-Mar-2014 Igor Murashkin <iam@google.com> camera: Fix setParameters for Preview FPS single/range values

Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
ameraParameters.cpp
b5ea3014b8be9eaa16da0144bd81af6fa514d8e2 18-Mar-2014 Dan Stoza <stoza@google.com> Merge "Remove deprecated BufferQueue constructor"
e1445da74730473a66a3ae8414e940aebfe6585d 17-Mar-2014 Igor Murashkin <iam@google.com> camera2: Don't log vendor tag errors when camera HAL too old

Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
CameraService.cpp
endorTagDescriptor.cpp
d1176ef16677b6c94fb893edb6a864cdccc0b190 21-Feb-2014 Ruben Brunk <rubenbrunk@google.com> camera3: Pass vendor tags through binder.

Bug: 12134423

- Adds a class for parceling vendor tag definitions.
- Passes vendor tag definitions to clients of the camera service.
- Switches over to new vendor tag mechanism when reading from HAL.

Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
ndroid.mk
CameraService.cpp
endorTagDescriptor.cpp
ests/Android.mk
ests/VendorTagDescriptorTests.cpp
8aa0f0619ea867e8fb240cf27913d4f8ae767385 12-Mar-2014 Dan Stoza <stoza@google.com> Remove deprecated BufferQueue constructor

Bug: 13415624
Change-Id: Ifc8f778b70102a38a9f7a086632e6884714e6b58
roCamera.cpp
1d6fa7af1288b550faabe4ec2cf98684236723db 11-Feb-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 566be7c3 to master

Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
377b2ec9a2885f9b6405b07ba900a9e3f4349c38 03-Feb-2014 Kévin PETIT <kevin.petit@arm.com> Make frameworks/av 64-bit compatible

Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.

Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
ameraParameters.cpp
146aed1ec05579b8840a592c3654c641ab36065c 05-Dec-2013 Zhijun He <zhijunhe@google.com> CameraMetadata: fix metadata alignment issue

When camera metadata is passed through binder interface, there is no
guarantee the destination address of the metadata copy is aligned to
the alignment boundary required by metadata copy, which could cause
metadata validation fail. this change aligns the start address of the
metadata copy destination blob to address this issue.

Bug: 12010193
Change-Id: I540c6b4c484fe87a1d625a362310f33a309c1772
ameraMetadata.cpp
fd6ecdd39bd83ea020f78b425e96310380d66c35 11-Oct-2013 Eino-Ville Talvala <etalvala@google.com> Camera HAL3/API1: Add support for the partial result quirk.

- Camera2Client:
- Detect partial result quirk
- Camera3Device:
- Accumulate all partial results together
- Fire off 3A-only result once all 3A states are available
- FrameProcessorBase:
- Filter out partials, don't send to listeners
- FrameProcessor:
- Skip face detect on partials
- Make sure to only handle a 3A update for a given frame once
- Trigger AF notifications when AF mode or trigger changes, to
properly detect all AF transitions.

Bug: 11115603
Change-Id: Iea8aa73c568701562a46071f7ea100624251d10b
ameraMetadata.cpp
f1e98d857ec377f2c9b916073d40732e6ebb7ced 06-Sep-2013 Eino-Ville Talvala <etalvala@google.com> Camera API 2, Device 2/3: Implement idle and shutter callbacks

- Update callback Binder interface
- Rename frameId to be requestId to be consistent and disambiguate
from frameNumber.
- Implement shutter callback from HAL2/3 notify()
- Add in-flight tracking to HAL2
- Add requestId to in-flight tracking
- Report requestId from shutter callback
- Implement idle callback from HAL3 process_capture_result
- Add new idle tracker thread
- Update all idle waiting to use the tracker
- Add reporting from request thread, all streams to tracker
- Remove existing idle waiting infrastructure

Bug: 10549462
Change-Id: I867bfc248e3848c50e71527e3561fe92dc037958
ProCameraCallbacks.cpp
roCamera.cpp
amera2/ICameraDeviceCallbacks.cpp
ests/ProCameraTests.cpp
2b59be89dc245b6e2475d9e8b0c5f2392370e71e 25-Sep-2013 Zhijun He <zhijunhe@google.com> Camera: Implement getCameraCharacteristics

Bug: 10904541
Bug: 10360518
Change-Id: Ie9ca6b3b0b5f2fe529e6b0decc193096e770a017
CameraService.cpp
d1d6467d3bcbc1305eeba0176a2edf04925c368e 07-Sep-2013 Zhijun He <zhijunhe@google.com> Camera: Correct stream id types

Bug: 10604704
Change-Id: I223ac5d200eb6439c08955fb7ad586592099fbae
ests/ProCameraTests.cpp
e07f53720bcf543bcfe90c228a49c2a85a3fdb4c 27-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Merge "Camera2: Add flush support" into klp-dev
88aef23d00a509693a955b6a207c0fb023fbc92d 24-Aug-2013 Igor Murashkin <iam@google.com> camera2: Get rid of annoying "Reading a NULL string...." error message

Bug: 10461464
Change-Id: Ie99f025db0e0e12c703f2d391e218b49330ee4dd
amera2/ICameraDeviceUser.cpp
abaa51d3ca31f0eda99e1d271e6dc64c877dbf58 14-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Camera2: Add flush support

- On HAL2 devices, fall back to wait until idle
- On HAL3 devices, call HAL flush method

Bug: 9758581
Change-Id: Ie1c570a15f6590a1ee6c271e3b989c48079b468a
amera2/ICameraDeviceUser.cpp
4b820b0e1fa069714b123fc35784541d0f94d267 21-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Camera1: Rename setPreviewTexture to ...Target for clarity

Bug: 10312644
Change-Id: I19976188f0359bfd177209fb40145defdae9c740
amera.cpp
1ce7c34e67c2cf58dd88c31f36f4bd62e375f7f0 21-Aug-2013 Eino-Ville Talvala <etalvala@google.com> Camera1: Set preview to be asynchronous, and remove dead code

- Use the controlledByApp flag to make sure application-bound
preview buffer queue is asynchronous as before
- Remove setPreviewDisplay in service, since it is no longer in
the binder interface
- Rename setPreviewTexture to setPreviewTarget, to make it clear it's
the only game in town now. Rename only on the binder level and service
for now.

Bug: 10312644
Change-Id: Icd33a462022f9729a63dc65c69b755cb7969857e
amera.cpp
Camera.cpp
0f61d8f14aa368c9cd7076528e8096e10ed100a0 08-Aug-2013 Ruben Brunk <rubenbrunk@google.com> Refactor CameraService to handle errors properly.

Bug: 10361136

-Connect calls now return status_t error flags.

Change-Id: Idca453b111e5df31327f6c99ebe853bb2e332b95
amera.cpp
ameraBase.cpp
CameraService.cpp
roCamera.cpp
deeef54487a34034dc0cfaab20b20d557224c07c 02-Aug-2013 Mathias Agopian <mathias@google.com> separte producer and consumer interfaces

Bug: 9265647
Change-Id: Iefabc11e4bd2e2e8ffd31160476c450affe6629c
roCamera.cpp
11d0d44d583f679638cc927bfffe920e495e90cc 31-Jul-2013 Zhijun He <zhijunhe@google.com> Camera: fix the metadate parcel write issue

Also rename the frameId to requestId to make it less confusing.

Change-Id: I14a20b6fcabb86294afb31fc0c56397e185c1373
amera2/ICameraDeviceCallbacks.cpp
7b82efe7a376c882f8f938e1c41b8311a8cdda4a 26-Jul-2013 Eino-Ville Talvala <etalvala@google.com> Camera: Rename new API to camera2, rearrange camera service

- Support API rename from photography to camera2
- Reorganize camera service files
- API support files to api1/, api2/, api_pro/
- HAL device support files into device{1,2,3}/
- Common files into common/
- Camera service remains at top-level

Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9
ndroid.mk
CameraService.cpp
amera2/CaptureRequest.cpp
amera2/ICameraDeviceCallbacks.cpp
amera2/ICameraDeviceUser.cpp
hotography/CaptureRequest.cpp
hotography/ICameraDeviceCallbacks.cpp
hotography/ICameraDeviceUser.cpp
2ab500c632569e2f131a1a2288459933da70c4ee 23-Jul-2013 Zhijun He <zhijunhe@google.com> camera2: Implement ICameraDeviceUser::waitUntilIdle

Also fixed some logging typo

Change-Id: Ib254bdb137dca10b12595c23aeb1c53097423425
hotography/ICameraDeviceUser.cpp
5e1f08b3917ac7900f8a11118afb7e8bf3e61c64 17-Jul-2013 Mathias Agopian <mathias@google.com> update to new Consumer APIs

Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
roCamera.cpp
5478f3c44b9d6670261733953a71a8290fa70ae8 16-Jul-2013 Mathias Agopian <mathias@google.com> Merge "always pass the BufferQueue explicitely to consumers"
099b457f3203fa51387e21bd450495abb973ab31 13-Jul-2013 Igor Murashkin <iam@google.com> camera2: Implement ICameraDeviceUser::getCameraInfo

Bug: 9529161
Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
hotography/ICameraDeviceUser.cpp
8d764bfc74c40641f018a0aa87d6f484aec92eae 13-Jul-2013 Mathias Agopian <mathias@google.com> always pass the BufferQueue explicitely to consumers

Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
roCamera.cpp
91a582c46758949c8ac205507d72595c8c0fe1f3 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set"

* commit '8ebdfa8b021ed338f9916a1f30d756b989afa3bd':
Typo in CameraParameters::set
5de9ef20d596bc20f53cba664f1ac7e358910ea2 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 365ed394: Merge "Typo in CameraParameters::set"

* commit '365ed394c4135d9d42082c85638c076aed4bd156':
Typo in CameraParameters::set
e7ee7637747371635a85fedd24d2190bb1f38651 12-Jun-2013 Igor Murashkin <iam@google.com> Initial implementation of android.hardware.photography.CameraDevice (service)

* Verified preview streaming requests
* Other things *should* work but unverified / unimplemented in client side

Missing:
* CameraService needs to return static camera info metadata

Bug: 9213377
Change-Id: I71568560fcf18d0e2b408ed1c4d0066647314868
ndroid.mk
ameraMetadata.cpp
CameraService.cpp
ProCameraCallbacks.cpp
ProCameraUser.cpp
hotography/CaptureRequest.cpp
hotography/ICameraDeviceCallbacks.cpp
hotography/ICameraDeviceUser.cpp
bef3f23f16f2fc575b3f425febcfcc436a7db70f 31-May-2013 Igor Murashkin <iam@google.com> camera: Make some binder interfaces compatible with AIDL

Done:
* ICameraService
* ICameraServiceListener

Partial:
* ICamera (disconnect only)
* IProCameraUser (disconnect only)

Bug: 9213377
Change-Id: I8e2e6e05cfd02ec36be1d5b2c551f10ffb43b5b4
Camera.cpp
CameraService.cpp
CameraServiceListener.cpp
ProCameraUser.cpp
81243ade35dc0e8e9db4ea1afcdec9f124cb40e5 07-May-2013 Igor Murashkin <iam@google.com> am ad60695f: am 1a95a727: Merge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev

* commit 'ad60695f2dcea0b6ea1d3a92a034b5067b87783e':
camera: Use new camera_metadata structure validation functions
d1ae0fe1f3a0b8883e3fd1e6a1f15c6acaafc618 01-May-2013 Igor Murashkin <iam@google.com> camera: Use new camera_metadata structure validation functions

* Reject unvalidated metadata across binder boundaries
* Sanity check in-process CameraMetadata when mutating data

Bug: 8713951
Change-Id: I121d8e15f8fdc9cdbbaf27dfd947813e11831e1c
ameraMetadata.cpp
ProCameraUser.cpp
e2d1e3d0436aec645739c65e6d3131dd814f40a1 01-May-2013 Igor Murashkin <iam@google.com> camera: Use new camera_metadata structure validation functions

* Reject unvalidated metadata across binder boundaries
* Sanity check in-process CameraMetadata when mutating data

Bug: 8713951
Change-Id: I121d8e15f8fdc9cdbbaf27dfd947813e11831e1c
ameraMetadata.cpp
ProCameraUser.cpp
15f227174e4b606f71f14efa1275c0f85bfc7011 22-Apr-2013 Igor Murashkin <iam@google.com> am b9258b57: am d090054d: Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev

* commit 'b9258b57aa0c86e4741e2c24474bb9d766d17e8e':
Fix ProCameraTests to pass on Wolfie, disabling failing tests
c6deb68aa7d1b9a4a4ba4549411c3be2753723d2 18-Apr-2013 Igor Murashkin <iam@google.com> Fix ProCameraTests to pass on Wolfie, disabling failing tests

Note: tests fail in racy conditions, but we don't occur those conditions
in practice in other consumers of ProCamera.

Bug: 8654735
Change-Id: Ic73395ad564031a6b30ad99762dee59f9c35cecf
ests/ProCameraTests.cpp
c8e19c1dadedf53710eab211e14daf723ec66705 18-Apr-2013 Igor Murashkin <iam@google.com> Fix ProCameraTests to pass on Wolfie, disabling failing tests

Note: tests fail in racy conditions, but we don't occur those conditions
in practice in other consumers of ProCamera.

Bug: 8654735
Change-Id: Ic73395ad564031a6b30ad99762dee59f9c35cecf
ests/ProCameraTests.cpp
3ee3550a2f529cbf56d87d8503f59a8f45dccf32 03-Apr-2013 Eino-Ville Talvala <etalvala@google.com> Camera: Add preview callback surface support

- Add call to set a preview callback surface
- Implement support for HAL2/3 devices
- Still need HAL1 implementation

Change-Id: I0dc0bd72e43d871aa487858d1665c1efca633ffe
amera.cpp
Camera.cpp
7455393a82bea99b88740365bc6612cbcac1a14a 15-Apr-2013 Yu Shan Emily Lau <yslau@google.com> Merge "Update the test output path." into jb-mr2-dev
1821b0a4eb7a78d2744801b1f863455fd384e283 15-Apr-2013 Yu Shan Emily Lau <yslau@google.com> Merge "Update the test output path." into jb-mr2-dev
41f37e7c29b5cc3bbd9ee60ea73c4d857d2ad717 12-Apr-2013 Yu Shan Emily Lau <yslau@google.com> Update the test output path.

In order for the automated test to pick up the test.
The output must be in /data/nativetest.

Change-Id: Idc15036afb5617ac1ef67ff74ba332c5f73fe155
ests/Android.mk
b34e0b72f013794acec4304ec3dec8da8dba81a6 12-Apr-2013 Yu Shan Emily Lau <yslau@google.com> Update the test output path.

In order for the automated test to pick up the test.
The output must be in /data/nativetest.

Change-Id: Idc15036afb5617ac1ef67ff74ba332c5f73fe155
ests/Android.mk
da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ndroid.mk
ecba7488c5cceaacef95836b1b476433451e7761 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ndroid.mk
3b53bc9b41c262d22f094406e3751bc5a41ef2ef 28-Feb-2013 Eino-Ville Talvala <etalvala@google.com> Camera: Add input side to camera3 HAL device

- Stream creation/deletion
- Request submission
- Request thread loop
- Add get() to CameraMetadata to allow HAL submission while retaining
ownership.

Change-Id: I271f72bcbe9557eded43cbcbfe789109857f8144
ameraMetadata.cpp
f76e027c43f531fc6f9287838b5c332236a4338a 28-Feb-2013 Eino-Ville Talvala <etalvala@google.com> Camera: Add input side to camera3 HAL device

- Stream creation/deletion
- Request submission
- Request thread loop
- Add get() to CameraMetadata to allow HAL submission while retaining
ownership.

Change-Id: I271f72bcbe9557eded43cbcbfe789109857f8144
ameraMetadata.cpp
ad065d38daace14281801127bd447114b7b4daa5 27-Mar-2013 Igor Murashkin <iam@google.com> Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
8d012b56cbd49f33841c13aaa5b7b42020de82ed 27-Mar-2013 Igor Murashkin <iam@google.com> Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
65d7986ceac6e35426749ac7e05bbd2a38949db4 27-Mar-2013 Igor Murashkin <iam@google.com> ProCamera: Fix memory leak in consumeFrameMetadata

Bug: 8402301
Change-Id: I975990185f45bb8552712271b9ac457af08a170c
roCamera.cpp
ests/ProCameraTests.cpp
e3e18d93d6b519145b3aa8e921a4d6fe1d67cfa8 27-Mar-2013 Igor Murashkin <iam@google.com> ProCamera: Fix memory leak in consumeFrameMetadata

Bug: 8402301
Change-Id: I975990185f45bb8552712271b9ac457af08a170c
roCamera.cpp
ests/ProCameraTests.cpp
cba2c163555cd329f49d40658ea3ee902e94dda3 20-Mar-2013 Igor Murashkin <iam@google.com> Camera: Add hotplug support (for fixed # of cameras)

* Minor: also change addListener to fire the current status upon subscription
* Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated

Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
ests/ProCameraTests.cpp
a36381479c5c546a01188390f1e0d2e280a3dbd8 20-Mar-2013 Igor Murashkin <iam@google.com> Camera: Add hotplug support (for fixed # of cameras)

* Minor: also change addListener to fire the current status upon subscription
* Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated

Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
ests/ProCameraTests.cpp
475391897f0886aae1833d5e8b2e5aea47cc36bb 18-Mar-2013 Igor Murashkin <iam@google.com> ProCameraTests: Minor add grey/frame count debug-only print outs

Change-Id: I0f7b7f3c083a644e9bb0c2302244a5ad434e96a8
ests/ProCameraTests.cpp
46ee76c093796924de4e0d356220844a99d10707 18-Mar-2013 Igor Murashkin <iam@google.com> ProCameraTests: Minor add grey/frame count debug-only print outs

Change-Id: I0f7b7f3c083a644e9bb0c2302244a5ad434e96a8
ests/ProCameraTests.cpp
99617adda9bc46c43f511f0940bc735c73de61de 13-Mar-2013 Mathias Agopian <mathias@google.com> remove uses of Surface in favor or IGraphicBufferProducer

Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
amera.cpp
Camera.cpp
33da402287605e40e189289b11a08b8f5d515818 13-Mar-2013 Mathias Agopian <mathias@google.com> remove uses of Surface in favor or IGraphicBufferProducer

Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
amera.cpp
Camera.cpp
fa4cf9d310685b4c25877cba772ff7da84caf517 05-Mar-2013 Igor Murashkin <iam@google.com> (Camera)ProCamera: Remove unused functions from binder interface

Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
amera.cpp
ameraBase.cpp
ProCameraCallbacks.cpp
ProCameraUser.cpp
roCamera.cpp
ests/ProCameraTests.cpp
7cf9a7e7d19579565e0f9dba8be9c107f2dbf548 05-Mar-2013 Igor Murashkin <iam@google.com> (Camera)ProCamera: Remove unused functions from binder interface

Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
amera.cpp
ameraBase.cpp
ProCameraCallbacks.cpp
ProCameraUser.cpp
roCamera.cpp
ests/ProCameraTests.cpp
fb413768551ea8ba3af05efb9906e7e2348f2431 28-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: Add CpuConsumer asynchronous mode support

Bug: 8290146
Bug: 8291751
Change-Id: I25423a2b8a70ac7169911b1c7b482aa17190fe0f
roCamera.cpp
ests/ProCameraTests.cpp
ba5ca4ee770fa0fe9e14990fd13b23f1010f5c98 28-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: Add CpuConsumer asynchronous mode support

Bug: 8290146
Bug: 8291751
Change-Id: I25423a2b8a70ac7169911b1c7b482aa17190fe0f
roCamera.cpp
ests/ProCameraTests.cpp
8fdfbe27acd157d58fa35a849ec50c82464062f0 27-Feb-2013 Igor Murashkin <iam@google.com> Camera: Drop ProCamera connections when a Camera connection happens

* Also adds an ICameraServiceListener with available/not available statuses

Bug: 8291653
Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
ndroid.mk
ameraBase.cpp
CameraService.cpp
CameraServiceListener.cpp
ests/ProCameraTests.cpp
bfc9915f482520eb9676c6d2dbf7f1ac078d937d 27-Feb-2013 Igor Murashkin <iam@google.com> Camera: Drop ProCamera connections when a Camera connection happens

* Also adds an ICameraServiceListener with available/not available statuses

Bug: 8291653
Change-Id: I24680f1a2dc109510caf451cf7c7bd180b670d84
ndroid.mk
ameraBase.cpp
CameraService.cpp
CameraServiceListener.cpp
ests/ProCameraTests.cpp
721f17283e2493426c47bbaa267c337b2af5726e 28-Feb-2013 Igor Murashkin <iam@google.com> ProCameraTest: Drop frames test move processing delay between lock/unlock

* This makes it more likely to find races with the buffer being unlocked
by itself

Change-Id: I1fa7dbfb73f60664a02a35678b58bcc9b06893a2
ests/ProCameraTests.cpp
3fa4891f54bbfdbe8ee652930d22c96639964eff 28-Feb-2013 Igor Murashkin <iam@google.com> ProCameraTest: Drop frames test move processing delay between lock/unlock

* This makes it more likely to find races with the buffer being unlocked
by itself

Change-Id: I1fa7dbfb73f60664a02a35678b58bcc9b06893a2
ests/ProCameraTests.cpp
b84d935c179a275a47e07291d2a983daf844de80 26-Feb-2013 Igor Murashkin <iam@google.com> camera_client: refactor Camera/ProCamera commonalities into BasicCamera

Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
ndroid.mk
amera.cpp
ameraBase.cpp
CameraService.cpp
roCamera.cpp
c073ba525404f3416c2824c435d3d926a9892f1b 26-Feb-2013 Igor Murashkin <iam@google.com> camera_client: refactor Camera/ProCamera commonalities into BasicCamera

Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
ndroid.mk
amera.cpp
ameraBase.cpp
CameraService.cpp
roCamera.cpp
48af7e8dd40883d6154e7029d9500072b551b5fa 19-Feb-2013 Eino-Ville Talvala <etalvala@google.com> CameraService and Stagefright: Support AppOps

Camera:
- Signal to AppOpsService when camera usage starts and stops
- Listen to permissions revocations and act on them
- Currently just kill camera connection when permissions lost

Stagefright:
- Pass on client name, UID to camera as needed

Bug: 8181262
Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
amera.cpp
CameraService.cpp
ceb388d6c03c38b96dc41c0ea4804b749aa077c4 19-Feb-2013 Eino-Ville Talvala <etalvala@google.com> CameraService and Stagefright: Support AppOps

Camera:
- Signal to AppOpsService when camera usage starts and stops
- Listen to permissions revocations and act on them
- Currently just kill camera connection when permissions lost

Stagefright:
- Pass on client name, UID to camera as needed

Bug: 8181262
Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
amera.cpp
CameraService.cpp
94a90a43b2a9f83b3a4a4a59247b74ad50336860 20-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: Fix waitForFrameBuffer not handling multiple outstanding frames

If the CpuConsumer triggered multiple onFrameAvailable callbacks in between
a single waitForFrameBuffer call, the old code would only handle 1 callback.

This meant on two subsequent waitForFrameBuffer calls the second would always
timeout when two buffers were already available to be unlocked.

Bug: 8238112
Change-Id: Ibefca35005ac5c408e5ada97ec4a4344a9e3e497
roCamera.cpp
ests/ProCameraTests.cpp
4bc4a3845e456fd464556d79d20650a107e873e5 20-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: Fix waitForFrameBuffer not handling multiple outstanding frames

If the CpuConsumer triggered multiple onFrameAvailable callbacks in between
a single waitForFrameBuffer call, the old code would only handle 1 callback.

This meant on two subsequent waitForFrameBuffer calls the second would always
timeout when two buffers were already available to be unlocked.

Bug: 8238112
Change-Id: Ibefca35005ac5c408e5ada97ec4a4344a9e3e497
roCamera.cpp
ests/ProCameraTests.cpp
687f26c7bd7ece88cad8d51fc47be7ab1600af9d 21-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: add waitForFrameBuffer/waitForFrameResult blocking calls

Change-Id: I851d41aeecaa15245d5b9d622132e8706d6e292c
roCamera.cpp
ests/ProCameraTests.cpp
a140a6efea1db7837984b3578755cfa4eaa8d92d 21-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: add waitForFrameBuffer/waitForFrameResult blocking calls

Change-Id: I851d41aeecaa15245d5b9d622132e8706d6e292c
roCamera.cpp
ests/ProCameraTests.cpp
1d74853933937f3e3f120a6efffb1f4cec7f8ba7 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCameraTests: clean up a bit, still needs more cleanup

Change-Id: Ia7e18c81002c8d98176f21553cf13cbd13cfdf5d
ests/ProCameraTests.cpp
dcb07d51e307019731147751946774f45321edfb 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCameraTests: clean up a bit, still needs more cleanup

Change-Id: Ia7e18c81002c8d98176f21553cf13cbd13cfdf5d
ests/ProCameraTests.cpp
d127c2c8a8b68dae2f8743c310c2547e8f46d967 21-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: Add getInfo for getting static metadata (and a test)

Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
ProCameraUser.cpp
roCamera.cpp
ests/ProCameraTests.cpp
7b33a74bbc514b99c16be7fff9a34e892bc19264 21-Feb-2013 Igor Murashkin <iam@google.com> ProCamera: Add getInfo for getting static metadata (and a test)

Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
ProCameraUser.cpp
roCamera.cpp
ests/ProCameraTests.cpp
418e493e8d67924cfda652cb64965647ce6381cb 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera - implement onResultReceived callback for metadata callbacks

Change-Id: I46775402b007244bc383d6343a620eebbd492aad
ProCameraCallbacks.cpp
roCamera.cpp
ests/ProCameraTests.cpp
a91537e268f2b35f9f0dfdc0c4f84655c93285ae 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera - implement onResultReceived callback for metadata callbacks

Change-Id: I46775402b007244bc383d6343a620eebbd492aad
ProCameraCallbacks.cpp
roCamera.cpp
ests/ProCameraTests.cpp
5076182ce4bf657e7211264d0ad3861212f24aa1 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCameraTests - add CpuConsumer tests for dual streams

Change-Id: Ia010450dc79ac2841645b8c2e1553c9ec74ee5e3
ests/ProCameraTests.cpp
eb72e1796b3af548e87891a6d2b73b0567807f25 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCameraTests - add CpuConsumer tests for dual streams

Change-Id: Ia010450dc79ac2841645b8c2e1553c9ec74ee5e3
ests/ProCameraTests.cpp
c0767f148e29ce821281b5965c0e25b4c143e76d 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera - add createStreamCpu and unit test

Change-Id: I468172dbfdd78510b273bf9d119c950cbeda7ea3
roCamera.cpp
ests/ProCameraTests.cpp
5835cc46a2f06dbfa5fbdab70e091896ef2fb438 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera - add createStreamCpu and unit test

Change-Id: I468172dbfdd78510b273bf9d119c950cbeda7ea3
roCamera.cpp
ests/ProCameraTests.cpp
5494cdc67b541034c963919aef8acb8b665e4dde 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: Change ProCamera to take IGraphicBufferProducer

Change-Id: Iec62eead6d179aa5486f7719143340976bb76e7d
ProCameraUser.cpp
roCamera.cpp
76f8b43909817179b317880202360863b8f976d0 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: Change ProCamera to take IGraphicBufferProducer

Change-Id: Iec62eead6d179aa5486f7719143340976bb76e7d
ProCameraUser.cpp
roCamera.cpp
69e22433b9d7df77907579f67e47a159aa57f876 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera2Client - add createStream (service is stubbed) and unit test

Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
ProCameraUser.cpp
roCamera.cpp
ests/ProCameraTests.cpp
985fd30a10f6fec4293f071fd258c4726cff5a3d 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera2Client - add createStream (service is stubbed) and unit test

Change-Id: I1ae7ba9b24f5883c214c19a7ed0eaf0c802d69c1
ProCameraUser.cpp
roCamera.cpp
ests/ProCameraTests.cpp
9476926bb91bf15f7aff2a289a4805148f5a8a4e 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera - add createStream stub and unit test for it

Change-Id: Ic05130e63f4f2c0c3278ba348b192992169f105f
roCamera.cpp
ests/ProCameraTests.cpp
68506fd58d26748617babe94d5648503cb3690bb 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProCamera - add createStream stub and unit test for it

Change-Id: Ic05130e63f4f2c0c3278ba348b192992169f105f
roCamera.cpp
ests/ProCameraTests.cpp
90fce97bf320a5d0b3547d18fcb2c0d57347361e 30-Jan-2013 Igor Murashkin <iam@google.com> Camera: ProCameraTests - add asynchronous locking unit test

Change-Id: Ib79eb84046c9ed898bfb086a6600265fc351924c
ests/ProCameraTests.cpp
39f79f77a435c2f769477caeb071e2f9f6e78742 30-Jan-2013 Igor Murashkin <iam@google.com> Camera: ProCameraTests - add asynchronous locking unit test

Change-Id: Ib79eb84046c9ed898bfb086a6600265fc351924c
ests/ProCameraTests.cpp
68c80668304fc92db43bbe2e7cbe9753b6d3865a 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProClient add asynchronous locks and such

Change-Id: I551e5e5e76d9be733fab5224beaa7309268c0f38
ProCameraCallbacks.cpp
roCamera.cpp
ests/Android.mk
ests/ProCameraTests.cpp
5376573eff55f370f041889618c9a7a9e1894615 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: ProClient add asynchronous locks and such

Change-Id: I551e5e5e76d9be733fab5224beaa7309268c0f38
ProCameraCallbacks.cpp
roCamera.cpp
ests/Android.mk
ests/ProCameraTests.cpp
bfb5d5ef5bae01efac171397260a7152782d92c7 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: Add ProCamera private binder interface for an API2-light functionality

Change-Id: I2af7a807c99df75ea659e6e6acc9c4fca6a56274
ndroid.mk
amera.cpp
CameraService.cpp
ProCameraCallbacks.cpp
ProCameraUser.cpp
roCamera.cpp
ests/Android.mk
ests/ProCameraTests.cpp
634a51509ee50475f3e9f8ccf897e90fc72ded31 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: Add ProCamera private binder interface for an API2-light functionality

Change-Id: I2af7a807c99df75ea659e6e6acc9c4fca6a56274
ndroid.mk
amera.cpp
CameraService.cpp
ProCameraCallbacks.cpp
ProCameraUser.cpp
roCamera.cpp
ests/Android.mk
ests/ProCameraTests.cpp
e4e5b2f23fa85cae789dc6824ea8af321e211d60 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: Add unit test infrastructure for libcameraclient

Change-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c
ndroid.mk
ests/Android.mk
ests/main.cpp
1d88023e1de6b9f370eb4be944dd9c4480d01f11 21-Feb-2013 Igor Murashkin <iam@google.com> Camera: Add unit test infrastructure for libcameraclient

Change-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c
ndroid.mk
ests/Android.mk
ests/main.cpp
537799199bdd7a585585dee409e0e3a86bad93b7 14-Feb-2013 Igor Murashkin <iam@google.com> Camera: Add exists function to CameraMetadata

Change-Id: I081f61417fca7c8408e9e767129647ddce5364ab
ameraMetadata.cpp
fc42642ab78da5fe25bcbea7a568bf880268a9dc 14-Feb-2013 Igor Murashkin <iam@google.com> Camera: Add exists function to CameraMetadata

Change-Id: I081f61417fca7c8408e9e767129647ddce5364ab
ameraMetadata.cpp
bd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e 14-Feb-2013 Igor Murashkin <iam@google.com> Camera: Move CameraMetadata.h from service to client library

Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f
ndroid.mk
ameraMetadata.cpp
7efa520c76e6a1f6b3146404cc6aca5a8353583a 14-Feb-2013 Igor Murashkin <iam@google.com> Camera: Move CameraMetadata.h from service to client library

Change-Id: I940ce86f318f37ae5b73f912a6e589415150125f
ndroid.mk
ameraMetadata.cpp
484566c410afdfbc4b6bc5aa1732aef37428a5b8 18-Dec-2012 Andy McFadden <fadden@android.com> 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: I64520a55f8c09fe6215382ea361c539a9940cba5
amera.cpp
Camera.cpp
8ba01021b573889802e67e029225a96f0dfa471a 18-Dec-2012 Andy McFadden <fadden@android.com> 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: I64520a55f8c09fe6215382ea361c539a9940cba5
amera.cpp
Camera.cpp
4c18eb30b493a4cd8d56bbcf8acb526b97c401a4 14-Dec-2012 You Kim <you.kim72@gmail.com> Typo in CameraParameters::set

Typo: 'key' --> 'value'

Change-Id: Idd0426263cf2125a796406abaf6f29f04f425fe4
ameraParameters.cpp
0517e304d0cce25653a033e3cb00172d54ba251d 28-Sep-2012 James Painter <jpainter@google.com> DO NOT MERGE: Remove experimental parameters for burst mode

Bug: 7248756
Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d
ameraParameters.cpp
c61b2aaab1846dea4b53555696739a3ba704f0ec 10-Sep-2012 Eino-Ville Talvala <etalvala@google.com> Camera: Add HDR scene mode constants.

Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
ameraParameters.cpp
c81284a2b77c630046ee57e6d73ac5d367e558f1 10-Sep-2012 Eino-Ville Talvala <etalvala@google.com> Camera: Add HDR scene mode constants.

Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
ameraParameters.cpp
e538206d15282afbc5b168d60b1026a5dfcd13c0 06-Sep-2012 James Painter <jpainter@google.com> Camera2: Add a burst mode skeleton.

Bug: 6243944
Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
ameraParameters.cpp
c3dbf1a40df85b75e5805382838a90416f69730f 06-Sep-2012 James Painter <jpainter@google.com> Camera2: Add a burst mode skeleton.

Bug: 6243944
Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
ameraParameters.cpp
f6d9696bf1db133d16dd8981380e1bfbd2e0bc70 19-Jul-2012 Eino-Ville Talvala <etalvala@google.com> Camera: Add OPAQUE pixel format to CameraParameters

This is only used to support recording with HAL 2 in the
KEY_VIDEO_FRAME_FORMAT parameter, and is not exposed to applications.

Bug: 6243944
Change-Id: I5976a748d199ae98189bd03af5bbd9e18cbd6bf0
ameraParameters.cpp
3d51d5cb53cc630709a0ba78d0e60501a675f2d5 13-Jun-2012 James Dong <jdong@google.com> Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/

Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26
related-to-bug: 6647465
ODULE_LICENSE_APACHE2
OTICE
08ad5efcef90e24db2863c0f85972ed05fe848a2 18-Apr-2012 Wu-cheng Li <wuchengli@google.com> Remove new camera connect API.

Applications are not resumed under the lock screen now.
This API is not needed anymore.

bug:5584464
Change-Id: I115daf6b647348617ec0fc05b626878c945b9b29
amera.cpp
CameraService.cpp
2fd2440d0175ca3e196b01b7541a9e0d4ed9a694 24-Feb-2012 Wu-cheng Li <wuchengli@google.com> Add a new camera open API that allows taking the ownership.

The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.

bug:5584464

Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
amera.cpp
CameraService.cpp
df712ea86e6350f7005a02ab0e1c60c28a343ed0 26-Feb-2012 Mathias Agopian <mathias@google.com> fix libgui header location

Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
amera.cpp
Camera.cpp
29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
amera.cpp
ameraParameters.cpp
5ff1dd576bb93c45b44088a51544a18fc43ebf58 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
amera.cpp
b8a805261bf0282e992d3608035e47d05a898710 20-Dec-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
amera.cpp
ameraParameters.cpp
3856b090cd04ba5dd4a59a12430ed724d5995909 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
amera.cpp
Camera.cpp
CameraClient.cpp
CameraRecordingProxy.cpp
CameraRecordingProxyListener.cpp
7019d2247e644470a0e8eb99b02b8b2d656fd9fb 11-Oct-2011 Eino-Ville Talvala <etalvala@google.com> Add video stabilization control to Camera parameters.

Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.

Convenience accessor methods hidden for now.

Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
ameraParameters.cpp
a8e409f8f9b40737d0b03355894b5e141d0aff6b 30-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add video snapshot camera parameter.

The API is still hidden.

bug:5187868

Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
ameraParameters.cpp
ab3f1388c71aed957f94ddab976faa77ab77e67f 16-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.

The API is still hidden.

bug:5086125
Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
ameraParameters.cpp
79e2ab42c38d1099bcd7c8840caa5a85c9fcb104 02-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add camera bayer image format.

The API are hidden.

bug:5086073

Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
ameraParameters.cpp
57c86189bc07d9ccb0fd044e66df736d0bf19639 29-Jul-2011 Wu-cheng Li <wuchengli@google.com> Pass camera frame metadata from camera service to Java.

bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
amera.cpp
CameraClient.cpp
40cdc56efa47580d89a93750cefecb8ccbaf9a72 02-Aug-2011 Wu-cheng Li <wuchengli@google.com> Add camera recording hint parameter.

The API is still hidden.

bug:4266229
Change-Id: I5e4c24e9e2808582aecb55ac4f1d5be3ed7e36a2
ameraParameters.cpp
7fc25dd82dec8474139315b8e905f103c13406f5 21-Jul-2011 Wu-cheng Li <wuchengli@google.com> Add camera face detection API.

API are still hidden.

bug:4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
ameraParameters.cpp
5e0067b486c3862316aa1f293cf9690c0cf54bda 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
ndroid.mk
4ca2c7c913f8bd4ada13aca56d36045d42d1e00f 01-Jun-2011 Wu-cheng Li <wuchengli@google.com> Add framework support for camcorder zoom.

The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.

Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.

ICameraRecordingProxy
startRecording()
stopRecording()
releaseRecordingFrame()

ICameraRecordingProxyListener
dataCallbackTimestamp()

The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.

The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
(1) The app: MediaRecorder.start().
(2) The recorder: ICamera.unlock() and ICamera.disconnect().
(3) The recorder: ICameraRecordingProxy.startRecording().
(4) The app: ICamera.reconnect().
(5) The app: ICamera.startRecording().
4. During recording
(1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
(2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
(1) The app: MediaRecorder.stop()
(2) The recorder: ICameraRecordingProxy.stopRecording().
(3) The app: ICamera.stopRecording().

bug:2644213

Change-Id: I15269397defc25cbbcae16abc071c8349c123122
ndroid.mk
amera.cpp
CameraRecordingProxy.cpp
CameraRecordingProxyListener.cpp
5e7271d6e24efb891e0de141a06228c99866f49f 07-Jun-2011 Iliyan Malchev <malchev@google.com> CameraParameters: add PIXEL_FORMAT_RGBA8888

Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8
Signed-off-by: Iliyan Malchev <malchev@google.com>
ameraParameters.cpp
fd99e1dda6a46ac3312cacb3bc1b633b2df95df2 13-May-2011 Eino-Ville Talvala <etalvala@google.com> Add auto-white balance locking to the Camera API.

Adds a new camera parameter for locking auto-white balance to its
current value. Also adds a function for checking if auto-white balance
lock is supported by the current platform. Lock semantics match that
of the auto-exposure lock.

Hidden for now.

Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
ameraParameters.cpp
95fbf2cdccb127bae1f68827564b36290c8de2c3 15-Apr-2011 Eino-Ville Talvala <etalvala@google.com> Add an auto-exposure lock feature to the Camera API.

Adds a new camera parameter for locking auto-exposure to its current
value. Also adds a function for checking if auto-exposure lock is
supported by the current platform.

Hidden for now.

Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
ameraParameters.cpp
38ecadbeb09fc0504621f5aa513e51b7a204983f 12-Apr-2011 Wu-cheng Li <wuchengli@google.com> Add camera metering area API.

The API are still hidden.

bug:3475893
Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
ameraParameters.cpp
a1c3d37ef921bfc79a0f7d2ac7f897943134d48d 02-Apr-2011 Wu-cheng Li <wuchengli@google.com> Add camera focus area API.

The API are still hidden.

bug:3475893

Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
ameraParameters.cpp
108dddf924d714c811dd565b8f4c7a0178cca2f2 29-Mar-2011 Iliyan Malchev <malchev@google.com> frameworks/base: some camera-interface cleanup

Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct
image_rect_struct are no longer used (instead, the necessary information is
passed through ANativeWindow.)

Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb
Signed-off-by: Iliyan Malchev <malchev@google.com>
amera.cpp
Camera.cpp
5f7fcf29a7475a20cf38bf72da67746135d504c3 26-Mar-2011 Mathias Agopian <mathias@google.com> merge libsurfaceflinger_client into libgui

this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
ndroid.mk
6f7a293c1bbf993ff712927e3e14af0d195cf1c1 24-Feb-2011 Wu-cheng Li <wuchengli@google.com> Merge "Add YV12 preview format to camera parameter constants."
d42c6e8904f1648a7dedcd1dc27b926951f8ff28 22-Feb-2011 Wu-cheng Li <wuchengli@google.com> Add YV12 preview format to camera parameter constants.

bug:3463624
Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
ameraParameters.cpp
e468ac57f6e8afc6078c76d4eb1ac327112a3de0 18-Feb-2011 James Dong <jdong@google.com> Application-managed callback buffer support for raw image

bug - 3292153

Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
amera.cpp
Camera.cpp
bfa33aae4f54c0020a0568b16a3acb7b30b6ca3d 20-Dec-2010 Jamie Gennis <jgennis@google.com> Add camera service support for SurfaceTexture.

This change enables the use of a SurfaceTexture in place of a Surface as
the destination of camera preview frames.

Change-Id: Ic70d404c8fe261e9d5da6f1de93d6babb5b191cb
ndroid.mk
amera.cpp
Camera.cpp
627baacc748c5e2ed68bdb256aea4d70fcfe9ce4 04-Jan-2011 Wu-cheng Li <wuchengli@google.com> Camera::create should fail when it fails to connect the camera.

bug:3197565

Change-Id: I3439a25c06b00615e8257e6b3db85df081643643
amera.cpp
0f5a6f9231e04b5c04af5dc2ad020755e2616f31 30-Nov-2010 James Dong <jdong@google.com> Add preferred preview size support in the camera framework

bug - 3237021

Change-Id: Ica8a3ae5cfbee462b74de98770e33277186c9a2b
ameraParameters.cpp
c42478ed7b8a379d2f8a43d4d349680c8a37573f 15-Nov-2010 James Dong <jdong@google.com> Fixed a race condition where some recording frames may not be released.

When startRecording() is called before setListener(), recording frames
are sent right after startRecording(), but there is no listener to
release the recording frames. This causes the hang in media server.

bug - 3166356

Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
amera.cpp
e2ad6734eccc4b9ea7857c747ff9469a9c11ba09 19-Oct-2010 James Dong <jdong@google.com> Camera framework change required for 0-memcpy recording

bug - 3042125

Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
amera.cpp
Camera.cpp
0d14c25355b7807b88fcdc76040ef986aa754815 30-Sep-2010 James Dong <jdong@google.com> Video size retrieval/configuration support in camera hal

This is the first part of the camera hal change required for
0-memcpy of input video frames for video recording.

o removed check in setVideoSize()/getVideoSize() for impl consistency

Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
ameraParameters.cpp
9219e0b4eb346b5e0a1a21e77fe22b8c2232ec4b 21-Sep-2010 Wu-cheng Li <wuchengli@google.com> am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.

Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'

* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
ac4205c9064ca961883b1ccf2ce565e449c0983e 21-Sep-2010 Wu-cheng Li <wuchengli@google.com> Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.

This constant is not public yet. Continuous autofocus should
behave differently in still camera and camcorder. In camcorder,
lens movement may be more smooth. And the triggers to start a
new focus search may be different. If there is a need,
FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future.

Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
ameraParameters.cpp
e2d8ba8c36fd39eb98f604b11654aa5466673260 16-Sep-2010 James Dong <jdong@google.com> Add YUV420P color format support for video output from camera hal

Change-Id: I5c8266348d0840361c8095ce351ac85c44d4068f
ameraParameters.cpp
f015774f9d5a8b7af547ccad92d98b5cfd4009fb 30-Aug-2010 Wu-cheng Li <wuchengli@google.com> am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.

Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'

* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
Remove camera metering mode API.
541d7655d9dc0322eb616e17b6767365bf64e3ed 28-Aug-2010 Wu-cheng Li <wuchengli@google.com> Remove camera metering mode API.

Metering mode is not supported yet.

Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
ameraParameters.cpp
10d3d28bdd0004dec5cc7963ec4a73f096fe93d2 24-Aug-2010 Wu-cheng Li <wuchengli@google.com> am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread

Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'

* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
Add camera fps range API.
4b79168835965cf0fc41ebe2a367e22b4cb20d08 11-Aug-2010 Jamie Gennis <jgennis@google.com> Change the framework to use the new camera preview path.

This change makes the camera HAL interface take an ANativeWindow interface from
which all the camera preview buffers will be allocated. The framework code
running in application processes now passes a Surface object rather than an
ISurface to the camera server via Binder when setting the preview surface. The
camera server then forwards that Surface object (which implements the
ANativeWindow interface) to the camera HAL, which uses it to communicate with
SurfaceFlinger to allocate the camera preview buffers.

Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
amera.cpp
Camera.cpp
04379fa9a001934373bf17358978c753c7e4e8b5 12-Aug-2010 Wu-cheng Li <wuchengli@google.com> Add camera fps range API.

Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
ameraParameters.cpp
e44607eacd044362d3debf5d95abc93ca36a9274 04-Aug-2010 Nipun Kwatra <nkwatra@google.com> Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE

Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.

Change-Id: I41d4f62f9f1641e9e9258aa2ebaeda13ba846c02
ameraParameters.cpp
34c91a321c297c1a7518ec4f10ae5993904034dd 30-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE

Also added a struct 'Size' containing a width and a height field.
Modified parse_size to optionally set an end pointer pointing to the
character after the found size.

Change-Id: I0c95ebf1ad4684721b32165f363db7d4d15a1b19
ameraParameters.cpp
0cc18781fb331f4f90070ed5c76db068d3ce3c64 04-Aug-2010 Nipun Kwatra <nkwatra@google.com> Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.

Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.

Change-Id: I435317427c1ee9623caef435f93e95d4476b7285
ameraParameters.cpp
99b4de92430fe42f9d1493c8a4c3d27de89d3549 30-Jul-2010 Nipun Kwatra <nkwatra@google.com> Adding getSupportedPictureSizes which returns a Vector of supported Sizes.

Also added a struct 'Size' containing a width and a height field.
Modified parse_size to optionally set an end pointer pointing to the
character after the found size.

Change-Id: I51a56bbf2cb7c91d7b80a28e6bd6a559f40a1333
ameraParameters.cpp
9da2070b6d6d20550de7da61478c325f0928d020 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 27eecb70 to gingerbread

Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 4506c62a: fix inaccurate copyrights

Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp

* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
fix inaccurate copyrights
68335fdd6e9c1d622384612605d6952503cb7fd0 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> fix inaccurate copyrights

Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
amera.cpp
01cff464978aa0f749f42650180b45ea56cb17de 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> fix inaccurate copyrights

Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
amera.cpp
ddbdb35d176266b5ab64c30178f5cb76c5b1b4b4 10-Jun-2010 Chih-Chung Chang <chihchung@google.com> Change camera interface to support multiple cameras.

Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
amera.cpp
CameraService.cpp
d38bee5858f5387afc28dcb97139b760ac8a1c63 04-Jun-2010 Wu-cheng Li <wuchengli@google.com> Add KEY_SUPPORTED_METERING_MODES and fix some typos.

bug:2737111
Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448
ameraParameters.cpp
2b8aba228e6ebd45fe29714baa477f3ea2320095 03-Jun-2010 Wu-cheng Li <wuchengli@google.com> Add camera metering mode API.

bug:2737111
Change-Id: Ie986fee56ebeaaed2d2efb757701dfe3ffdec8d8
ameraParameters.cpp
0b0279e0d20a8beb69aa2af5f4cb278841710dfb 28-May-2010 Wu-cheng Li <wuchengli@google.com> Add video frame parameter.

The image format of preview frames and video frames may be different.
We need another parameter for video frame format.

bug:2720893
Change-Id: I966a31b0ce8cab25cdde65db65a18c8cbe9c7bd6
ameraParameters.cpp
ae77ffa16bda593fb3751e41d45327d867f3c8e1 15-May-2010 Wu-cheng Li <wuchengli@google.com> Fix build error.

Original name INFINITY conflicts with the macro in math.h.

Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e
ameraParameters.cpp
09a2ab9dfe5c8fe74703b9894d930b1b1dbf0c11 13-May-2010 Wu-cheng Li <wuchengli@google.com> Add camera focus distances API.

Applications can use this API to estimate the distance
between the subject and the camera.

bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
ameraParameters.cpp
d06618ee31c11ac7ac6698f95444041a4785a5ab 13-May-2010 Chih-Chung Chang <chihchung@google.com> Fix deadlock if the last reference of ICameraClient is removed in
ICamera::connect()

Change-Id: I34ab3e4f07435c62168175e9bb159022c8fb99f4
amera.cpp
83e5a900e5eccbd2af300c03d24d72365d0c8323 12-May-2010 Wu-cheng Li <wuchengli@google.com> am d8c33747: am 78624e41: Add remove method in CameraParameters class.

Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken

* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
Add remove method in CameraParameters class.
adbda96f6a05507788bb4163d7fbe8a95948f0a5 10-May-2010 Wu-cheng Li <wuchengli@google.com> Add remove method in CameraParameters class.

bug:2672651
Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
ameraParameters.cpp
4bf7ace0d9d51cd47e00f92d26e1ee87909b3cc5 06-May-2010 Wu-cheng Li <wuchengli@google.com> Add continuous focus mode constant.

bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
ameraParameters.cpp
35a055b8bfc6f3cbea409b2897caf936654519cb 06-May-2010 Chih-Chung Chang <chihchung@google.com> Support multiple cameras in framework.

Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
amera.cpp
CameraService.cpp
465d5a7f3517f11aaa819c8ae982e113ad5ec479 29-Mar-2010 Wu-cheng Li <wuchengli@google.com> Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.

bug:2544367
Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
ameraParameters.cpp
8cc76ae259ad81d5a40277bbf5532696ebae8da8 29-Mar-2010 Wu-cheng Li <wuchengli@google.com> Add some comments for zoom methods.

Also change RuntimeException to IllegalArgumentException.
bug:2458926

Change-Id: I87af31f5f3f10244131a1117bd1725c2d292b587
Camera.cpp
f8ed70a20f8b006539af98c8ad45be9561665f82 25-Mar-2010 Chih-Chung Chang <chihchung@google.com> Call unlinkToDeath() when we disconnect the Camera,
so we don't hold the (weak) reference to it, which caused
(small) memory leaks.

Change-Id: If7d58a354fd38c8bc380946bf227b52988ac5118
amera.cpp
d8d888ea7c14715c2210c8dea1a623116c992264 09-Mar-2010 Wu-cheng Li <wuchengli@google.com> Add camera parameter string constant for "true".

bug:2458926
Change-Id: I11eaae8ff031765e23f2627ded5873eabc09cead
ameraParameters.cpp
c0170bc6c6c81f5dfa86a132bf29ee48c01329d9 23-Feb-2010 Ray Chen <raychen@google.com> Add location provider name to gps-processing-method in EXIF header.
ameraParameters.cpp
949c5037a6e019ff575bd481d286908c2eaa1e34 01-Mar-2010 Wu-cheng Li <wuchengli@google.com> Unhide zoom API.

bug:2458926
ameraParameters.cpp
4f1bff97170d33575e55a8e110b097c05607095f 20-Feb-2010 Wu-cheng Li <wuchengli@google.com> Unhide exposure compensation API.

bug:2375993
ameraParameters.cpp
3cf613507f1e2f7bd932d921a6e222e426fd3be4 10-Feb-2010 Mathias Agopian <mathias@google.com> split libsurfaceflinger_client and libcamera_client out of libui
ndroid.mk
amera.cpp
ameraParameters.cpp
Camera.cpp
CameraClient.cpp
CameraService.cpp