Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev (a32fd0e2) · Commits · e / os / android_frameworks_av

camera/Camera.cpp

+2 −20

Original line number	Diff line number	Diff line
		@@ -96,32 +96,14 @@ status_t Camera::unlock()
		return c->unlock();
		}

		// pass the buffered Surface to the camera service
		status_t Camera::setPreviewDisplay(const sp<Surface>& surface)
		{
		ALOGV("setPreviewDisplay(%p)", surface.get());
		sp <ICamera> c = mCamera;
		if (c == 0) return NO_INIT;
		if (surface != 0) {
		return c->setPreviewDisplay(surface);
		} else {
		ALOGD("app passed NULL surface");
		return c->setPreviewDisplay(0);
		}
		}

		// pass the buffered IGraphicBufferProducer to the camera service
		status_t Camera::setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer)
		{
		ALOGV("setPreviewTexture(%p)", bufferProducer.get());
		sp <ICamera> c = mCamera;
		if (c == 0) return NO_INIT;
		if (bufferProducer != 0) {
		ALOGD_IF(bufferProducer == 0, "app passed NULL surface");
		return c->setPreviewTexture(bufferProducer);
		} else {
		ALOGD("app passed NULL surface");
		return c->setPreviewTexture(0);
		}
		}

		// start preview mode

+0 −19

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ namespace android {

		enum {
		DISCONNECT = IBinder::FIRST_CALL_TRANSACTION,
		SET_PREVIEW_DISPLAY,
		SET_PREVIEW_TEXTURE,
		SET_PREVIEW_CALLBACK_FLAG,
		START_PREVIEW,
		@@ -68,17 +67,6 @@ public:
		remote()->transact(DISCONNECT, data, &reply);
		}

		// pass the buffered Surface to the camera service
		status_t setPreviewDisplay(const sp<Surface>& surface)
		{
		ALOGV("setPreviewDisplay");
		Parcel data, reply;
		data.writeInterfaceToken(ICamera::getInterfaceDescriptor());
		Surface::writeToParcel(surface, &data);
		remote()->transact(SET_PREVIEW_DISPLAY, data, &reply);
		return reply.readInt32();
		}

		// pass the buffered IGraphicBufferProducer to the camera service
		status_t setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer)
		{
		@@ -282,13 +270,6 @@ status_t BnCamera::onTransact(
		disconnect();
		return NO_ERROR;
		} break;
		case SET_PREVIEW_DISPLAY: {
		ALOGV("SET_PREVIEW_DISPLAY");
		CHECK_INTERFACE(ICamera, data, reply);
		sp<Surface> surface = Surface::readFromParcel(data);
		reply->writeInt32(setPreviewDisplay(surface));
		return NO_ERROR;
		} break;
		case SET_PREVIEW_TEXTURE: {
		ALOGV("SET_PREVIEW_TEXTURE");
		CHECK_INTERFACE(ICamera, data, reply);

+0 −3

Original line number	Diff line number	Diff line
		@@ -74,9 +74,6 @@ public:
		status_t lock();
		status_t unlock();

		// pass the buffered Surface to the camera service
		status_t setPreviewDisplay(const sp<Surface>& surface);

		// pass the buffered IGraphicBufferProducer to the camera service
		status_t setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer);

+0 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,6 @@ public:
		// allow other processes to use this ICamera interface
		virtual status_t unlock() = 0;

		// pass the buffered Surface to the camera service
		virtual status_t setPreviewDisplay(const sp<Surface>& surface) = 0;

		// pass the buffered IGraphicBufferProducer to the camera service
		virtual status_t setPreviewTexture(
		const sp<IGraphicBufferProducer>& bufferProducer) = 0;

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ public:

		virtual status_t setCamera(const sp<ICamera>& camera,
		const sp<ICameraRecordingProxy>& proxy) = 0;
		virtual status_t setPreviewSurface(const sp<Surface>& surface) = 0;
		virtual status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface) = 0;
		virtual status_t setVideoSource(int vs) = 0;
		virtual status_t setAudioSource(int as) = 0;
		virtual status_t setOutputFormat(int of) = 0;