Merge branch 'master' into honeycomb-release (35dd2b7a) · Commits · e / os / platform_frameworks_native

include/surfaceflinger/Surface.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ private:
		friend class SurfaceComposerClient;

		// camera and camcorder need access to the ISurface binder interface for preview
		friend class Camera;
		friend class CameraService;
		friend class MediaRecorder;
		// mediaplayer needs access to ISurface for display
		friend class MediaPlayer;
		@@ -173,11 +173,12 @@ private:
		* (eventually this should go away and be replaced by proper APIs)
		*/
		// camera and camcorder need access to the ISurface binder interface for preview
		friend class Camera;
		friend class CameraService;
		friend class MediaRecorder;
		// MediaPlayer needs access to ISurface for display
		friend class MediaPlayer;
		friend class IOMX;
		friend class SoftwareRenderer;
		// this is just to be able to write some unit tests
		friend class Test;

		@@ -309,4 +310,3 @@ private:
		}; // namespace android

		#endif // ANDROID_SF_SURFACE_H

+0 −5

Original line number	Diff line number	Diff line
		@@ -344,11 +344,6 @@ ssize_t SharedBufferClient::dequeue()
		{
		SharedBufferStack& stack( *mSharedStack );

		if (stack.head == tail && stack.available == mNumBuffers) {
		LOGW("dequeue: tail=%d, head=%d, avail=%d, queued=%d",
		tail, stack.head, stack.available, stack.queued);
		}

		RWLock::AutoRLock _rd(mLock);

		const nsecs_t dequeueTime = systemTime(SYSTEM_TIME_THREAD);

+10 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,13 @@ status_t Surface::writeToParcel(
		height = surface->mHeight;
		format = surface->mFormat;
		flags = surface->mFlags;
		} else if (surface != 0 && surface->mSurface != 0) {
		LOGW("Parceling invalid surface with non-NULL ISurface as NULL: "
		"mSurface = %p, mIdentity = %d, mWidth = %d, mHeight = %d, "
		"mFormat = %d, mFlags = 0x%08x, mInitCheck = %d",
		surface->mSurface.get(), surface->mIdentity, surface->mWidth,
		surface->mHeight, surface->mFormat, surface->mFlags,
		surface->mInitCheck);
		}
		parcel->writeStrongBinder(sur!=0 ? sur->asBinder() : NULL);
		parcel->writeInt32(identity);
		@@ -434,6 +441,9 @@ void Surface::init()
		mSharedBufferClient = new SharedBufferClient(
		mClient.getSharedClient(), token, 2, mIdentity);
		mInitCheck = mClient.getSharedClient()->validate(token);
		} else {
		LOGW("Not initializing the shared buffer client because token = %d",
		token);
		}
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
		LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

		ifeq ($(TARGET_BOARD_PLATFORM), omap3)
		LOCAL_CFLAGS += -DNO_RGBX_8888
		LOCAL_CFLAGS += -DNO_RGBX_8888 -DHAS_PUSH_BUFFERS
		endif

		# need "-lrt" on Linux simulator to pick up clock_gettime

+27 −21

Original line number	Diff line number	Diff line
		@@ -1211,9 +1211,12 @@ sp<ISurface> SurfaceFlinger::createSurface(const sp<Client>& client, int pid,
		sp<Layer> normalLayer;
		switch (flags & eFXSurfaceMask) {
		case eFXSurfaceNormal:
		#if HAS_PUSH_BUFFERS
		if (UNLIKELY(flags & ePushBuffers)) {
		layer = createPushBuffersSurface(client, d, w, h, flags);
		} else {
		} else
		#endif
		{
		normalLayer = createNormalSurface(client, d, w, h, flags, format);
		layer = normalLayer;
		}
		@@ -1742,12 +1745,15 @@ ssize_t UserClient::getTokenForSurface(const sp<ISurface>& sur) const
		{
		int32_t name = NAME_NOT_FOUND;
		sp<Layer> layer(mFlinger->getLayer(sur));
		if (layer == 0) return name;
		if (layer == 0) {
		return name;
		}

		// if this layer already has a token, just return it
		name = layer->getToken();
		if ((name >= 0) && (layer->getClient() == this))
		if ((name >= 0) && (layer->getClient() == this)) {
		return name;
		}

		name = 0;
		do {