Merge "Add dvrBufferGlobalLayoutVersion which returns the version number for the global buffers." (0525a331) · Commits · e / os / android_frameworks_native-old

libs/vr/libdvr/dvr_buffer.cpp

+6 −0

Original line number	Diff line number	Diff line
		#include "include/dvr/dvr_buffer.h"

		#include <android/hardware_buffer.h>
		#include <dvr/dvr_shared_buffers.h>
		#include <private/dvr/buffer_hub_client.h>
		#include <ui/GraphicBuffer.h>

		@@ -176,6 +177,11 @@ int dvrBufferGetAHardwareBuffer(DvrBuffer* buffer,
		hardware_buffer);
		}

		// Retrieve the shared buffer layout version defined in dvr_shared_buffers.h.
		int dvrBufferGlobalLayoutVersionGet() {
		return android::dvr::kSharedBufferLayoutVersion;
		}

		const struct native_handle* dvrWriteBufferGetNativeHandle(
		DvrWriteBuffer* write_buffer) {
		if (!write_buffer \|\| !write_buffer->write_buffer)

+1 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,7 @@ typedef const struct native_handle* (*DvrReadBufferGetNativeHandlePtr)(
		typedef void (DvrBufferDestroyPtr)(DvrBuffer buffer);
		typedef int (*DvrBufferGetAHardwareBufferPtr)(
		DvrBuffer* buffer, AHardwareBuffer** hardware_buffer);
		typedef int (*DvrBufferGlobalLayoutVersionGetPtr)();
		typedef const struct native_handle* (*DvrBufferGetNativeHandlePtr)(
		DvrBuffer* buffer);

+1 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ DVR_V1_API_ENTRY(ReadBufferGetNativeHandle);
		DVR_V1_API_ENTRY(BufferDestroy);
		DVR_V1_API_ENTRY(BufferGetAHardwareBuffer);
		DVR_V1_API_ENTRY(BufferGetNativeHandle);
		DVR_V1_API_ENTRY(BufferGlobalLayoutVersionGet);

		// Write buffer queue
		DVR_V1_API_ENTRY(WriteBufferQueueDestroy);

+3 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,9 @@ void dvrBufferDestroy(DvrBuffer* buffer);
		int dvrBufferGetAHardwareBuffer(DvrBuffer* buffer,
		AHardwareBuffer** hardware_buffer);

		// Retrieve the shared buffer layout version defined in dvr_shared_buffers.h.
		int dvrBufferGlobalLayoutVersionGet();

		// TODO(eieio): Switch to return int and take an out parameter for the native
		// handle.
		const struct native_handle* dvrBufferGetNativeHandle(DvrBuffer* buffer);