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
diff --git a/camera/Android.mk b/camera/Android.mk
index 8f58f87..e633450 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -16,9 +16,9 @@
ICameraRecordingProxyListener.cpp \
IProCameraUser.cpp \
IProCameraCallbacks.cpp \
- photography/ICameraDeviceUser.cpp \
- photography/ICameraDeviceCallbacks.cpp \
- photography/CaptureRequest.cpp \
+ camera2/ICameraDeviceUser.cpp \
+ camera2/ICameraDeviceCallbacks.cpp \
+ camera2/CaptureRequest.cpp \
ProCamera.cpp \
CameraBase.cpp \
diff --git a/camera/ICameraService.cpp b/camera/ICameraService.cpp
index 068fb0f..876a2df 100644
--- a/camera/ICameraService.cpp
+++ b/camera/ICameraService.cpp
@@ -31,8 +31,8 @@
#include <camera/IProCameraCallbacks.h>
#include <camera/ICamera.h>
#include <camera/ICameraClient.h>
-#include <camera/photography/ICameraDeviceUser.h>
-#include <camera/photography/ICameraDeviceCallbacks.h>
+#include <camera/camera2/ICameraDeviceUser.h>
+#include <camera/camera2/ICameraDeviceCallbacks.h>
namespace android {
@@ -151,7 +151,7 @@
return interface_cast<IProCameraUser>(reply.readStrongBinder());
}
- // connect to camera service (android.hardware.photography.CameraDevice)
+ // connect to camera service (android.hardware.camera2.CameraDevice)
virtual sp<ICameraDeviceUser> connect(
const sp<ICameraDeviceCallbacks>& cameraCb,
int cameraId,
diff --git a/camera/photography/CaptureRequest.cpp b/camera/camera2/CaptureRequest.cpp
similarity index 98%
rename from camera/photography/CaptureRequest.cpp
rename to camera/camera2/CaptureRequest.cpp
index b822fc9..57e5319 100644
--- a/camera/photography/CaptureRequest.cpp
+++ b/camera/camera2/CaptureRequest.cpp
@@ -19,7 +19,7 @@
#define LOG_TAG "CameraRequest"
#include <utils/Log.h>
-#include <camera/photography/CaptureRequest.h>
+#include <camera/camera2/CaptureRequest.h>
#include <binder/Parcel.h>
#include <gui/Surface.h>
diff --git a/camera/photography/ICameraDeviceCallbacks.cpp b/camera/camera2/ICameraDeviceCallbacks.cpp
similarity index 95%
rename from camera/photography/ICameraDeviceCallbacks.cpp
rename to camera/camera2/ICameraDeviceCallbacks.cpp
index 19763d7..188bd8e 100644
--- a/camera/photography/ICameraDeviceCallbacks.cpp
+++ b/camera/camera2/ICameraDeviceCallbacks.cpp
@@ -26,7 +26,7 @@
#include <gui/Surface.h>
#include <utils/Mutex.h>
-#include <camera/photography/ICameraDeviceCallbacks.h>
+#include <camera/camera2/ICameraDeviceCallbacks.h>
#include "camera/CameraMetadata.h"
namespace android {
@@ -69,7 +69,7 @@
};
IMPLEMENT_META_INTERFACE(CameraDeviceCallbacks,
- "android.hardware.photography.ICameraDeviceCallbacks");
+ "android.hardware.camera2.ICameraDeviceCallbacks");
// ----------------------------------------------------------------------
@@ -107,4 +107,3 @@
// ----------------------------------------------------------------------------
}; // namespace android
-
diff --git a/camera/photography/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp
similarity index 97%
rename from camera/photography/ICameraDeviceUser.cpp
rename to camera/camera2/ICameraDeviceUser.cpp
index 95609da..923f487 100644
--- a/camera/photography/ICameraDeviceUser.cpp
+++ b/camera/camera2/ICameraDeviceUser.cpp
@@ -21,11 +21,11 @@
#include <stdint.h>
#include <sys/types.h>
#include <binder/Parcel.h>
-#include <camera/photography/ICameraDeviceUser.h>
+#include <camera/camera2/ICameraDeviceUser.h>
#include <gui/IGraphicBufferProducer.h>
#include <gui/Surface.h>
#include <camera/CameraMetadata.h>
-#include <camera/photography/CaptureRequest.h>
+#include <camera/camera2/CaptureRequest.h>
namespace android {
@@ -189,7 +189,7 @@
};
IMPLEMENT_META_INTERFACE(CameraDeviceUser,
- "android.hardware.photography.ICameraDeviceUser");
+ "android.hardware.camera2.ICameraDeviceUser");
// ----------------------------------------------------------------------