Camera: Move CameraMetadata.h from service to client library (bd02dd1b) · Commits · e / os / android_frameworks_av

camera/Android.mk

+6 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		Camera.cpp \
		CameraMetadata.cpp \
		CameraParameters.cpp \
		ICamera.cpp \
		ICameraClient.cpp \
		@@ -16,7 +17,11 @@ LOCAL_SHARED_LIBRARIES := \
		libbinder \
		libhardware \
		libui \
		libgui
		libgui \
		libcamera_metadata \

		LOCAL_C_INCLUDES += \
		system/media/camera/include

		LOCAL_MODULE:= libcamera_client

+5 −3

Original line number	Diff line number	Diff line
		@@ -18,11 +18,10 @@
		#include <utils/Log.h>
		#include <utils/Errors.h>

		#include "CameraMetadata.h"
		#include <camera/CameraMetadata.h>

		namespace android {

		namespace camera2 {
		CameraMetadata::CameraMetadata() :
		mBuffer(NULL) {
		}
		@@ -36,6 +35,10 @@ CameraMetadata::CameraMetadata(const CameraMetadata &other) {
		mBuffer = clone_camera_metadata(other.mBuffer);
		}

		CameraMetadata::CameraMetadata(camera_metadata_t *buffer) : mBuffer(NULL) {
		acquire(buffer);
		}

		CameraMetadata &CameraMetadata::operator=(const CameraMetadata &other) {
		return operator=(other.mBuffer);
		}
		@@ -292,5 +295,4 @@ status_t CameraMetadata::resizeIfNeeded(size_t extraEntries, size_t extraData) {
		return OK;
		}

		}; // namespace camera2
		}; // namespace android

+2 −4

Original line number	Diff line number	Diff line
		@@ -14,15 +14,14 @@
		* limitations under the License.
		*/

		#ifndef ANDROID_SERVERS_CAMERA_CAMERA2METADATA_CPP
		#define ANDROID_SERVERS_CAMERA_CAMERA2METADATA_CPP
		#ifndef ANDROID_CLIENT_CAMERA2_CAMERAMETADATA_CPP
		#define ANDROID_CLIENT_CAMERA2_CAMERAMETADATA_CPP

		#include "system/camera_metadata.h"
		#include <utils/String8.h>
		#include <utils/Vector.h>

		namespace android {
		namespace camera2 {

		/**
		* A convenience wrapper around the C-based camera_metadata_t library.
		@@ -167,7 +166,6 @@ class CameraMetadata {

		};

		}; // namespace camera2
		}; // namespace android

		#endif

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ LOCAL_SRC_FILES:= \
		CameraClient.cpp \
		Camera2Client.cpp \
		Camera2Device.cpp \
		camera2/CameraMetadata.cpp \
		camera2/Parameters.cpp \
		camera2/FrameProcessor.cpp \
		camera2/StreamingProcessor.cpp \

+0 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,6 @@ private:
		mutable Mutex mICameraLock;

		typedef camera2::Parameters Parameters;
		typedef camera2::CameraMetadata CameraMetadata;

		status_t setPreviewWindowL(const sp<IBinder>& binder,
		sp<ANativeWindow> window);