OSDN Git Service

Camera: Rename new API to camera2, rearrange camera service
authorEino-Ville Talvala <etalvala@google.com>
Fri, 26 Jul 2013 00:12:35 +0000 (17:12 -0700)
committerEino-Ville Talvala <etalvala@google.com>
Tue, 30 Jul 2013 17:58:44 +0000 (10:58 -0700)
commit7b82efe7a376c882f8f938e1c41b8311a8cdda4a
treed7ed69f0a495bc1a873a285ba11e72a9867c5565
parentd054c32443a493513ab63529b0c8b1aca290278c
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
67 files changed:
camera/Android.mk
camera/ICameraService.cpp
camera/camera2/CaptureRequest.cpp [moved from camera/photography/CaptureRequest.cpp with 98% similarity]
camera/camera2/ICameraDeviceCallbacks.cpp [moved from camera/photography/ICameraDeviceCallbacks.cpp with 96% similarity]
camera/camera2/ICameraDeviceUser.cpp [moved from camera/photography/ICameraDeviceUser.cpp with 98% similarity]
include/camera/camera2/CaptureRequest.h [moved from include/camera/photography/CaptureRequest.h with 100% similarity]
include/camera/camera2/ICameraDeviceCallbacks.h [moved from include/camera/photography/ICameraDeviceCallbacks.h with 100% similarity]
include/camera/camera2/ICameraDeviceUser.h [moved from include/camera/photography/ICameraDeviceUser.h with 100% similarity]
services/camera/libcameraservice/Android.mk
services/camera/libcameraservice/CameraDeviceFactory.cpp
services/camera/libcameraservice/CameraDeviceFactory.h
services/camera/libcameraservice/CameraService.cpp
services/camera/libcameraservice/CameraService.h
services/camera/libcameraservice/api1/Camera2Client.cpp [moved from services/camera/libcameraservice/Camera2Client.cpp with 99% similarity]
services/camera/libcameraservice/api1/Camera2Client.h [moved from services/camera/libcameraservice/Camera2Client.h with 92% similarity]
services/camera/libcameraservice/api1/CameraClient.cpp [moved from services/camera/libcameraservice/CameraClient.cpp with 99% similarity]
services/camera/libcameraservice/api1/CameraClient.h [moved from services/camera/libcameraservice/CameraClient.h with 100% similarity]
services/camera/libcameraservice/api1/client2/BurstCapture.cpp [moved from services/camera/libcameraservice/camera2/BurstCapture.cpp with 97% similarity]
services/camera/libcameraservice/api1/client2/BurstCapture.h [moved from services/camera/libcameraservice/camera2/BurstCapture.h with 96% similarity]
services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp [moved from services/camera/libcameraservice/camera2/CallbackProcessor.cpp with 99% similarity]
services/camera/libcameraservice/api1/client2/CallbackProcessor.h [moved from services/camera/libcameraservice/camera2/CallbackProcessor.h with 97% similarity]
services/camera/libcameraservice/api1/client2/Camera2Heap.h [moved from services/camera/libcameraservice/camera2/Camera2Heap.h with 100% similarity]
services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp [moved from services/camera/libcameraservice/camera2/CaptureSequencer.cpp with 99% similarity]
services/camera/libcameraservice/api1/client2/CaptureSequencer.h [moved from services/camera/libcameraservice/camera2/CaptureSequencer.h with 100% similarity]
services/camera/libcameraservice/api1/client2/FrameProcessor.cpp [moved from services/camera/libcameraservice/camera2/FrameProcessor.cpp with 98% similarity]
services/camera/libcameraservice/api1/client2/FrameProcessor.h [moved from services/camera/libcameraservice/camera2/FrameProcessor.h with 96% similarity]
services/camera/libcameraservice/api1/client2/JpegCompressor.cpp [moved from services/camera/libcameraservice/camera2/JpegCompressor.cpp with 100% similarity]
services/camera/libcameraservice/api1/client2/JpegCompressor.h [moved from services/camera/libcameraservice/camera2/JpegCompressor.h with 100% similarity]
services/camera/libcameraservice/api1/client2/JpegProcessor.cpp [moved from services/camera/libcameraservice/camera2/JpegProcessor.cpp with 98% similarity]
services/camera/libcameraservice/api1/client2/JpegProcessor.h [moved from services/camera/libcameraservice/camera2/JpegProcessor.h with 98% similarity]
services/camera/libcameraservice/api1/client2/Parameters.cpp [moved from services/camera/libcameraservice/camera2/Parameters.cpp with 100% similarity]
services/camera/libcameraservice/api1/client2/Parameters.h [moved from services/camera/libcameraservice/camera2/Parameters.h with 100% similarity]
services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp [moved from services/camera/libcameraservice/camera2/StreamingProcessor.cpp with 99% similarity]
services/camera/libcameraservice/api1/client2/StreamingProcessor.h [moved from services/camera/libcameraservice/camera2/StreamingProcessor.h with 99% similarity]
services/camera/libcameraservice/api1/client2/ZslProcessor.cpp [moved from services/camera/libcameraservice/camera2/ZslProcessor.cpp with 99% similarity]
services/camera/libcameraservice/api1/client2/ZslProcessor.h [moved from services/camera/libcameraservice/camera2/ZslProcessor.h with 94% similarity]
services/camera/libcameraservice/api1/client2/ZslProcessor3.cpp [moved from services/camera/libcameraservice/camera2/ZslProcessor3.cpp with 98% similarity]
services/camera/libcameraservice/api1/client2/ZslProcessor3.h [moved from services/camera/libcameraservice/camera2/ZslProcessor3.h with 93% similarity]
services/camera/libcameraservice/api1/client2/ZslProcessorInterface.h [moved from services/camera/libcameraservice/camera2/ZslProcessorInterface.h with 100% similarity]
services/camera/libcameraservice/api2/CameraDeviceClient.cpp [moved from services/camera/libcameraservice/photography/CameraDeviceClient.cpp with 98% similarity]
services/camera/libcameraservice/api2/CameraDeviceClient.h [moved from services/camera/libcameraservice/photography/CameraDeviceClient.h with 93% similarity]
services/camera/libcameraservice/api_pro/ProCamera2Client.cpp [moved from services/camera/libcameraservice/ProCamera2Client.cpp with 98% similarity]
services/camera/libcameraservice/api_pro/ProCamera2Client.h [moved from services/camera/libcameraservice/ProCamera2Client.h with 94% similarity]
services/camera/libcameraservice/common/Camera2ClientBase.cpp [moved from services/camera/libcameraservice/Camera2ClientBase.cpp with 98% similarity]
services/camera/libcameraservice/common/Camera2ClientBase.h [moved from services/camera/libcameraservice/Camera2ClientBase.h with 98% similarity]
services/camera/libcameraservice/common/CameraDeviceBase.cpp [moved from services/camera/libcameraservice/CameraDeviceBase.cpp with 100% similarity]
services/camera/libcameraservice/common/CameraDeviceBase.h [moved from services/camera/libcameraservice/CameraDeviceBase.h with 100% similarity]
services/camera/libcameraservice/common/FrameProcessorBase.cpp [moved from services/camera/libcameraservice/camera2/ProFrameProcessor.cpp with 86% similarity]
services/camera/libcameraservice/common/FrameProcessorBase.h [moved from services/camera/libcameraservice/camera2/ProFrameProcessor.h with 94% similarity]
services/camera/libcameraservice/device1/CameraHardwareInterface.h [moved from services/camera/libcameraservice/CameraHardwareInterface.h with 100% similarity]
services/camera/libcameraservice/device2/Camera2Device.cpp [moved from services/camera/libcameraservice/Camera2Device.cpp with 100% similarity]
services/camera/libcameraservice/device2/Camera2Device.h [moved from services/camera/libcameraservice/Camera2Device.h with 99% similarity]
services/camera/libcameraservice/device3/Camera3Device.cpp [moved from services/camera/libcameraservice/Camera3Device.cpp with 99% similarity]
services/camera/libcameraservice/device3/Camera3Device.h [moved from services/camera/libcameraservice/Camera3Device.h with 98% similarity]
services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp [moved from services/camera/libcameraservice/camera3/Camera3IOStreamBase.cpp with 100% similarity]
services/camera/libcameraservice/device3/Camera3IOStreamBase.h [moved from services/camera/libcameraservice/camera3/Camera3IOStreamBase.h with 100% similarity]
services/camera/libcameraservice/device3/Camera3InputStream.cpp [moved from services/camera/libcameraservice/camera3/Camera3InputStream.cpp with 100% similarity]
services/camera/libcameraservice/device3/Camera3InputStream.h [moved from services/camera/libcameraservice/camera3/Camera3InputStream.h with 100% similarity]
services/camera/libcameraservice/device3/Camera3OutputStream.cpp [moved from services/camera/libcameraservice/camera3/Camera3OutputStream.cpp with 100% similarity]
services/camera/libcameraservice/device3/Camera3OutputStream.h [moved from services/camera/libcameraservice/camera3/Camera3OutputStream.h with 100% similarity]
services/camera/libcameraservice/device3/Camera3OutputStreamInterface.h [moved from services/camera/libcameraservice/camera3/Camera3OutputStreamInterface.h with 100% similarity]
services/camera/libcameraservice/device3/Camera3Stream.cpp [moved from services/camera/libcameraservice/camera3/Camera3Stream.cpp with 100% similarity]
services/camera/libcameraservice/device3/Camera3Stream.h [moved from services/camera/libcameraservice/camera3/Camera3Stream.h with 100% similarity]
services/camera/libcameraservice/device3/Camera3StreamBufferListener.h [moved from services/camera/libcameraservice/camera3/Camera3StreamBufferListener.h with 100% similarity]
services/camera/libcameraservice/device3/Camera3StreamInterface.h [moved from services/camera/libcameraservice/camera3/Camera3StreamInterface.h with 100% similarity]
services/camera/libcameraservice/device3/Camera3ZslStream.cpp [moved from services/camera/libcameraservice/camera3/Camera3ZslStream.cpp with 100% similarity]
services/camera/libcameraservice/device3/Camera3ZslStream.h [moved from services/camera/libcameraservice/camera3/Camera3ZslStream.h with 100% similarity]