Run clang-format on libhostgraphics (c935f27d) · Commits · e / os / android_frameworks_base

libs/hostgraphics/ADisplay.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -94,12 +94,12 @@ namespace android {
	int ADisplay_acquirePhysicalDisplays(ADisplay*** outDisplays) {		int ADisplay_acquirePhysicalDisplays(ADisplay*** outDisplays) {
	// This is running on host, so there are no physical displays available.		// This is running on host, so there are no physical displays available.
	// Create 1 fake display instead.		// Create 1 fake display instead.
	DisplayImpl const impls = reinterpret_cast<DisplayImpl>(		DisplayImpl** const impls =
	malloc(sizeof(DisplayImpl*) + sizeof(DisplayImpl)));		reinterpret_cast<DisplayImpl*>(malloc(sizeof(DisplayImpl) + sizeof(DisplayImpl)));
	DisplayImpl* const displayData = reinterpret_cast<DisplayImpl*>(impls + 1);		DisplayImpl* const displayData = reinterpret_cast<DisplayImpl*>(impls + 1);

	displayData[0] = DisplayImpl{ADisplayType::DISPLAY_TYPE_INTERNAL,		displayData[0] =
	ADataSpace::ADATASPACE_UNKNOWN,		DisplayImpl{ADisplayType::DISPLAY_TYPE_INTERNAL, ADataSpace::ADATASPACE_UNKNOWN,
	AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM,		AHardwareBuffer_Format::AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM,
	DisplayConfigImpl()};		DisplayConfigImpl()};
	impls[0] = displayData;		impls[0] = displayData;

libs/hostgraphics/HostBufferQueue.cpp

+30 −16

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,6 @@
	*/		*/

	#include <gui/BufferQueue.h>		#include <gui/BufferQueue.h>

	#include <system/window.h>		#include <system/window.h>

	namespace android {		namespace android {
	@@ -25,11 +24,17 @@ public:
	HostBufferQueue() : mWidth(0), mHeight(0) {}		HostBufferQueue() : mWidth(0), mHeight(0) {}

	// Consumer		// Consumer
	virtual status_t setConsumerIsProtected(bool isProtected) { return OK; }		virtual status_t setConsumerIsProtected(bool isProtected) {
			return OK;
			}

	virtual status_t detachBuffer(int slot) { return OK; }		virtual status_t detachBuffer(int slot) {
			return OK;
			}

	virtual status_t getReleasedBuffers(uint64_t* slotMask) { return OK; }		virtual status_t getReleasedBuffers(uint64_t* slotMask) {
			return OK;
			}

	virtual status_t setDefaultBufferSize(uint32_t w, uint32_t h) {		virtual status_t setDefaultBufferSize(uint32_t w, uint32_t h) {
	mWidth = w;		mWidth = w;
	@@ -38,11 +43,17 @@ public:
	return OK;		return OK;
	}		}

	virtual status_t setDefaultBufferFormat(PixelFormat defaultFormat) { return OK; }		virtual status_t setDefaultBufferFormat(PixelFormat defaultFormat) {
			return OK;
			}

	virtual status_t setDefaultBufferDataSpace(android_dataspace defaultDataSpace) { return OK; }		virtual status_t setDefaultBufferDataSpace(android_dataspace defaultDataSpace) {
			return OK;
			}

	virtual status_t discardFreeBuffers() { return OK; }		virtual status_t discardFreeBuffers() {
			return OK;
			}

	virtual status_t acquireBuffer(BufferItem* buffer, nsecs_t presentWhen,		virtual status_t acquireBuffer(BufferItem* buffer, nsecs_t presentWhen,
	uint64_t maxFrameNumber = 0) {		uint64_t maxFrameNumber = 0) {
	@@ -51,9 +62,13 @@ public:
	return OK;		return OK;
	}		}

	virtual status_t setMaxAcquiredBufferCount(int maxAcquiredBuffers) { return OK; }		virtual status_t setMaxAcquiredBufferCount(int maxAcquiredBuffers) {
			return OK;
			}

	virtual status_t setConsumerUsageBits(uint64_t usage) { return OK; }		virtual status_t setConsumerUsageBits(uint64_t usage) {
			return OK;
			}

	// Producer		// Producer
	virtual int query(int what, int* value) {		virtual int query(int what, int* value) {
	@@ -84,7 +99,6 @@ private:

	void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,		void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,
	sp<IGraphicBufferConsumer>* outConsumer) {		sp<IGraphicBufferConsumer>* outConsumer) {

	sp<HostBufferQueue> obj(new HostBufferQueue());		sp<HostBufferQueue> obj(new HostBufferQueue());

	*outProducer = obj;		*outProducer = obj;

libs/hostgraphics/gui/BufferItem.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -17,16 +17,15 @@
	#ifndef ANDROID_GUI_BUFFERITEM_H		#ifndef ANDROID_GUI_BUFFERITEM_H
	#define ANDROID_GUI_BUFFERITEM_H		#define ANDROID_GUI_BUFFERITEM_H

			#include <system/graphics.h>
	#include <ui/Fence.h>		#include <ui/Fence.h>
	#include <ui/Rect.h>		#include <ui/Rect.h>

	#include <system/graphics.h>

	#include <utils/StrongPointer.h>		#include <utils/StrongPointer.h>

	namespace android {		namespace android {

	class Fence;		class Fence;

	class GraphicBuffer;		class GraphicBuffer;

	// The only thing we need here for layoutlib is mGraphicBuffer. The rest of the fields are added		// The only thing we need here for layoutlib is mGraphicBuffer. The rest of the fields are added
	@@ -37,6 +36,7 @@ public:
	enum { INVALID_BUFFER_SLOT = -1 };		enum { INVALID_BUFFER_SLOT = -1 };

	BufferItem() : mGraphicBuffer(nullptr), mFence(Fence::NO_FENCE) {}		BufferItem() : mGraphicBuffer(nullptr), mFence(Fence::NO_FENCE) {}

	~BufferItem() {}		~BufferItem() {}

	sp<GraphicBuffer> mGraphicBuffer;		sp<GraphicBuffer> mGraphicBuffer;
	@@ -60,6 +60,6 @@ public:
	bool mTransformToDisplayInverse;		bool mTransformToDisplayInverse;
	};		};

	}		} // namespace android

	#endif // ANDROID_GUI_BUFFERITEM_H		#endif // ANDROID_GUI_BUFFERITEM_H

libs/hostgraphics/gui/BufferItemConsumer.h

+24 −19

Original line number	Original line	Diff line number	Diff line
	@@ -17,28 +17,26 @@
	#ifndef ANDROID_GUI_BUFFERITEMCONSUMER_H		#ifndef ANDROID_GUI_BUFFERITEMCONSUMER_H
	#define ANDROID_GUI_BUFFERITEMCONSUMER_H		#define ANDROID_GUI_BUFFERITEMCONSUMER_H

	#include <utils/RefBase.h>

	#include <gui/ConsumerBase.h>		#include <gui/ConsumerBase.h>
	#include <gui/IGraphicBufferConsumer.h>		#include <gui/IGraphicBufferConsumer.h>
			#include <utils/RefBase.h>

	namespace android {		namespace android {

	class BufferItemConsumer : public ConsumerBase {		class BufferItemConsumer : public ConsumerBase {
	public:		public:
	BufferItemConsumer(		BufferItemConsumer(const sp<IGraphicBufferConsumer>& consumer, uint64_t consumerUsage,
	const sp<IGraphicBufferConsumer>& consumer,		int bufferCount, bool controlledByApp)
	uint64_t consumerUsage,		: mConsumer(consumer) {}
	int bufferCount,
	bool controlledByApp) : mConsumer(consumer) {
	}

	status_t acquireBuffer(BufferItem* item, nsecs_t presentWhen, bool waitForFence = true) {		status_t acquireBuffer(BufferItem* item, nsecs_t presentWhen, bool waitForFence = true) {
	return mConsumer->acquireBuffer(item, presentWhen, 0);		return mConsumer->acquireBuffer(item, presentWhen, 0);
	}		}

	status_t releaseBuffer(		status_t releaseBuffer(const BufferItem& item,
	const BufferItem &item, const sp<Fence>& releaseFence = Fence::NO_FENCE) { return OK; }		const sp<Fence>& releaseFence = Fence::NO_FENCE) {
			return OK;
			}

	void setName(const String8& name) {}		void setName(const String8& name) {}

	@@ -58,14 +56,21 @@ public:

	void abandon() {}		void abandon() {}

	status_t detachBuffer(int slot) { return OK; }		status_t detachBuffer(int slot) {
			return OK;
			}

	status_t discardFreeBuffers() { return OK; }		status_t discardFreeBuffers() {
			return OK;
			}

	void freeBufferLocked(int slotIndex) {}		void freeBufferLocked(int slotIndex) {}

	status_t addReleaseFenceLocked(		status_t addReleaseFenceLocked(int slot, const sp<GraphicBuffer> graphicBuffer,
	int slot, const sp<GraphicBuffer> graphicBuffer, const sp<Fence>& fence) { return OK; }		const sp<Fence>& fence) {
			return OK;
			}

	private:		private:
	sp<IGraphicBufferConsumer> mConsumer;		sp<IGraphicBufferConsumer> mConsumer;
	};		};

libs/hostgraphics/gui/ConsumerBase.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@
	#define ANDROID_GUI_CONSUMERBASE_H		#define ANDROID_GUI_CONSUMERBASE_H

	#include <gui/BufferItem.h>		#include <gui/BufferItem.h>

	#include <utils/RefBase.h>		#include <utils/RefBase.h>

	namespace android {		namespace android {
	@@ -28,6 +27,7 @@ public:
	struct FrameAvailableListener : public virtual RefBase {		struct FrameAvailableListener : public virtual RefBase {
	// See IConsumerListener::onFrame{Available,Replaced}		// See IConsumerListener::onFrame{Available,Replaced}
	virtual void onFrameAvailable(const BufferItem& item) = 0;		virtual void onFrameAvailable(const BufferItem& item) = 0;

	virtual void onFrameReplaced(const BufferItem& /* item */) {}		virtual void onFrameReplaced(const BufferItem& /* item */) {}
	};		};
	};		};