Merge "Camera2: Add notification handling skeleton." into jb-mr1-dev (d9f02533) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/Camera2Client.cpp

+24 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,6 @@ Camera2Client::~Camera2Client() {
		// Rewrite mClientPid to allow shutdown by CameraService
		mClientPid = getCallingPid();
		disconnect();

		}

		status_t Camera2Client::dump(int fd, const Vector<String16>& args) {
		@@ -1660,6 +1659,30 @@ status_t Camera2Client::commandSetVideoBufferCountL(size_t count) {

		/** Device-related methods */

		void Camera2Client::notifyError(int errorCode, int arg1, int arg2) {
		ALOGE("Error condition %d reported by HAL, arguments %d, %d", errorCode, arg1, arg2);
		}

		void Camera2Client::notifyShutter(int frameNumber, nsecs_t timestamp) {
		ALOGV("%s: Shutter notification for frame %d at time %lld", __FUNCTION__,
		frameNumber, timestamp);
		}

		void Camera2Client::notifyAutoFocus(uint8_t newState, int triggerId) {
		ALOGV("%s: Autofocus state now %d, last trigger %d",
		__FUNCTION__, newState, triggerId);
		}

		void Camera2Client::notifyAutoExposure(uint8_t newState, int triggerId) {
		ALOGV("%s: Autoexposure state now %d, last trigger %d",
		__FUNCTION__, newState, triggerId);
		}

		void Camera2Client::notifyAutoWhitebalance(uint8_t newState, int triggerId) {
		ALOGV("%s: Auto-whitebalance state now %d, last trigger %d",
		__FUNCTION__, newState, triggerId);
		}

		void Camera2Client::onCaptureAvailable() {
		ATRACE_CALL();
		status_t res;

services/camera/libcameraservice/Camera2Client.h

+14 −2

Original line number	Diff line number	Diff line
		@@ -31,10 +31,12 @@ namespace android {
		* Implements the android.hardware.camera API on top of
		* camera device HAL version 2.
		*/
		class Camera2Client : public CameraService::Client
		class Camera2Client : public CameraService::Client,
		public Camera2Device::NotificationListener
		{
		public:
		// ICamera interface (see ICamera for details)

		virtual void disconnect();
		virtual status_t connect(const sp<ICameraClient>& client);
		virtual status_t lock();
		@@ -59,17 +61,26 @@ public:
		virtual status_t sendCommand(int32_t cmd, int32_t arg1, int32_t arg2);

		// Interface used by CameraService

		Camera2Client(const sp<CameraService>& cameraService,
		const sp<ICameraClient>& cameraClient,
		int cameraId,
		int cameraFacing,
		int clientPid);
		~Camera2Client();
		virtual ~Camera2Client();

		status_t initialize(camera_module_t *module);

		virtual status_t dump(int fd, const Vector<String16>& args);

		// Interface used by CameraDevice

		virtual void notifyError(int errorCode, int arg1, int arg2);
		virtual void notifyShutter(int frameNumber, nsecs_t timestamp);
		virtual void notifyAutoFocus(uint8_t newState, int triggerId);
		virtual void notifyAutoExposure(uint8_t newState, int triggerId);
		virtual void notifyAutoWhitebalance(uint8_t newState, int triggerId);

		private:
		enum State {
		DISCONNECTED,
		@@ -389,6 +400,7 @@ private:

		// Map from camera orientation + facing to gralloc transform enum
		static int degToTransform(int degrees, bool mirror);

		};

		}; // namespace android

services/camera/libcameraservice/Camera2Device.cpp

+53 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,8 @@ status_t Camera2Device::initialize(camera_module_t *module)
		return res;
		}

		setNotifyCallback(NULL);

		return OK;
		}

		@@ -286,6 +288,57 @@ status_t Camera2Device::waitUntilDrained() {
		return OK;
		}

		status_t Camera2Device::setNotifyCallback(NotificationListener *listener) {
		status_t res;
		res = mDevice->ops->set_notify_callback(mDevice, notificationCallback,
		reinterpret_cast<void*>(listener) );
		if (res != OK) {
		ALOGE("%s: Unable to set notification callback!", __FUNCTION__);
		}
		return res;
		}

		void Camera2Device::notificationCallback(int32_t msg_type,
		int32_t ext1,
		int32_t ext2,
		int32_t ext3,
		void *user) {
		NotificationListener listener = reinterpret_cast<NotificationListener>(user);
		ALOGV("%s: Notification %d, arguments %d, %d, %d", __FUNCTION__, msg_type,
		ext1, ext2, ext3);
		if (listener != NULL) {
		switch (msg_type) {
		case CAMERA2_MSG_ERROR:
		listener->notifyError(ext1, ext2, ext3);
		break;
		case CAMERA2_MSG_SHUTTER: {
		nsecs_t timestamp = (nsecs_t)ext2 \| ((nsecs_t)(ext3) << 32 );
		listener->notifyShutter(ext1, timestamp);
		break;
		}
		case CAMERA2_MSG_AUTOFOCUS:
		listener->notifyAutoFocus(ext1, ext2);
		break;
		case CAMERA2_MSG_AUTOEXPOSURE:
		listener->notifyAutoExposure(ext1, ext2);
		break;
		case CAMERA2_MSG_AUTOWB:
		listener->notifyAutoWhitebalance(ext1, ext2);
		break;
		default:
		ALOGE("%s: Unknown notification %d (arguments %d, %d, %d)!",
		__FUNCTION__, msg_type, ext1, ext2, ext3);
		}
		}
		}

		/**
		* Camera2Device::NotificationListener
		*/

		Camera2Device::NotificationListener::~NotificationListener() {
		}

		/**
		* Camera2Device::MetadataQueue
		*/

services/camera/libcameraservice/Camera2Device.h

+28 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,27 @@ class Camera2Device : public virtual RefBase {
		*/
		status_t waitUntilDrained();

		/**
		* Abstract class for HAL notification listeners
		*/
		class NotificationListener {
		public:
		// Refer to the Camera2 HAL definition for notification definitions
		virtual void notifyError(int errorCode, int arg1, int arg2) = 0;
		virtual void notifyShutter(int frameNumber, nsecs_t timestamp) = 0;
		virtual void notifyAutoFocus(uint8_t newState, int triggerId) = 0;
		virtual void notifyAutoExposure(uint8_t newState, int triggerId) = 0;
		virtual void notifyAutoWhitebalance(uint8_t newState, int triggerId) = 0;
		protected:
		virtual ~NotificationListener();
		};

		/**
		* Connect HAL notifications to a listener. Overwrites previous
		* listener. Set to NULL to stop receiving notifications.
		*/
		status_t setNotifyCallback(NotificationListener *listener);

		private:

		const int mId;
		@@ -282,6 +303,13 @@ class Camera2Device : public virtual RefBase {
		typedef List<sp<StreamAdapter> > StreamList;
		StreamList mStreams;

		// Receives HAL notifications and routes them to the NotificationListener
		static void notificationCallback(int32_t msg_type,
		int32_t ext1,
		int32_t ext2,
		int32_t ext3,
		void *user);

		}; // class Camera2Device

		}; // namespace android