Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b82efe7 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

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
parent d054c324

camera/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ LOCAL_SRC_FILES:= \ 
	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 \

camera/ICameraService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ public: 
        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,

camera/photography/CaptureRequest.cpp→camera/camera2/CaptureRequest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

camera/photography/ICameraDeviceCallbacks.cpp→camera/camera2/ICameraDeviceCallbacks.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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 @@ public: 
};



IMPLEMENT_META_INTERFACE(CameraDeviceCallbacks,

                         "android.hardware.photography.ICameraDeviceCallbacks");

                         "android.hardware.camera2.ICameraDeviceCallbacks");



// ----------------------------------------------------------------------
@@ -107,4 +107,3 @@ status_t BnCameraDeviceCallbacks::onTransact( 
// ----------------------------------------------------------------------------



}; // namespace android

camera/photography/ICameraDeviceUser.cpp→camera/camera2/ICameraDeviceUser.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ private: 
};



IMPLEMENT_META_INTERFACE(CameraDeviceUser,

                         "android.hardware.photography.ICameraDeviceUser");

                         "android.hardware.camera2.ICameraDeviceUser");



// ----------------------------------------------------------------------