Merge change 21576 into eclair (51782509) · Commits · e / os / android_frameworks_base

include/binder/Parcel.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ public:
		status_t writeInt64(int64_t val);
		status_t writeFloat(float val);
		status_t writeDouble(double val);
		status_t writeIntPtr(intptr_t val);
		status_t writeCString(const char* str);
		status_t writeString8(const String8& str);
		status_t writeString16(const String16& str);
		@@ -109,6 +110,8 @@ public:
		status_t readFloat(float *pArg) const;
		double readDouble() const;
		status_t readDouble(double *pArg) const;
		intptr_t readIntPtr() const;
		status_t readIntPtr(intptr_t *pArg) const;

		const char* readCString() const;
		String8 readString8() const;
		@@ -163,6 +166,14 @@ private:
		void initState();
		void scanForFds() const;

		template<class T>
		status_t readAligned(T *pArg) const;

		template<class T> T readAligned() const;

		template<class T>
		status_t writeAligned(T val);

		status_t mError;
		uint8_t* mData;
		size_t mDataSize;

include/utils/Debug.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ template<> struct CompileTimeAssert<true> {};
		#define COMPILE_TIME_ASSERT(_exp) \
		template class CompileTimeAssert< (_exp) >;
		#endif
		#define COMPILE_TIME_ASSERT_FUNCTION_SCOPE(_exp) \
		CompileTimeAssert<( _exp )>();

		// ---------------------------------------------------------------------------

libs/binder/Parcel.cpp

+63 −95

Original line number	Diff line number	Diff line
		@@ -562,54 +562,27 @@ restart_write:

		status_t Parcel::writeInt32(int32_t val)
		{
		if ((mDataPos+sizeof(val)) <= mDataCapacity) {
		restart_write:
		reinterpret_cast<int32_t>(mData+mDataPos) = val;
		return finishWrite(sizeof(val));
		}

		status_t err = growData(sizeof(val));
		if (err == NO_ERROR) goto restart_write;
		return err;
		return writeAligned(val);
		}

		status_t Parcel::writeInt64(int64_t val)
		{
		if ((mDataPos+sizeof(val)) <= mDataCapacity) {
		restart_write:
		reinterpret_cast<int64_t>(mData+mDataPos) = val;
		return finishWrite(sizeof(val));
		}

		status_t err = growData(sizeof(val));
		if (err == NO_ERROR) goto restart_write;
		return err;
		return writeAligned(val);
		}

		status_t Parcel::writeFloat(float val)
		{
		if ((mDataPos+sizeof(val)) <= mDataCapacity) {
		restart_write:
		reinterpret_cast<float>(mData+mDataPos) = val;
		return finishWrite(sizeof(val));
		}

		status_t err = growData(sizeof(val));
		if (err == NO_ERROR) goto restart_write;
		return err;
		return writeAligned(val);
		}

		status_t Parcel::writeDouble(double val)
		{
		if ((mDataPos+sizeof(val)) <= mDataCapacity) {
		restart_write:
		reinterpret_cast<double>(mData+mDataPos) = val;
		return finishWrite(sizeof(val));
		return writeAligned(val);
		}

		status_t err = growData(sizeof(val));
		if (err == NO_ERROR) goto restart_write;
		return err;
		status_t Parcel::writeIntPtr(intptr_t val)
		{
		return writeAligned(val);
		}

		status_t Parcel::writeCString(const char* str)
		@@ -768,103 +741,98 @@ const void* Parcel::readInplace(size_t len) const
		return NULL;
		}

		status_t Parcel::readInt32(int32_t *pArg) const
		{
		if ((mDataPos+sizeof(int32_t)) <= mDataSize) {
		template<class T>
		status_t Parcel::readAligned(T *pArg) const {
		COMPILE_TIME_ASSERT_FUNCTION_SCOPE(PAD_SIZE(sizeof(T)) == sizeof(T));

		if ((mDataPos+sizeof(T)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(int32_t);
		pArg = reinterpret_cast<const int32_t*>(data);
		mDataPos += sizeof(T);
		pArg = reinterpret_cast<const T*>(data);
		return NO_ERROR;
		} else {
		return NOT_ENOUGH_DATA;
		}
		}

		int32_t Parcel::readInt32() const
		template<class T>
		T Parcel::readAligned() const {
		T result;
		if (readAligned(&result) != NO_ERROR) {
		result = 0;
		}

		return result;
		}

		template<class T>
		status_t Parcel::writeAligned(T val) {
		COMPILE_TIME_ASSERT_FUNCTION_SCOPE(PAD_SIZE(sizeof(T)) == sizeof(T));

		if ((mDataPos+sizeof(val)) <= mDataCapacity) {
		restart_write:
		reinterpret_cast<T>(mData+mDataPos) = val;
		return finishWrite(sizeof(val));
		}

		status_t err = growData(sizeof(val));
		if (err == NO_ERROR) goto restart_write;
		return err;
		}

		status_t Parcel::readInt32(int32_t *pArg) const
		{
		if ((mDataPos+sizeof(int32_t)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(int32_t);
		LOGV("readInt32 Setting data pos of %p to %d\n", this, mDataPos);
		return reinterpret_cast<const int32_t>(data);
		return readAligned(pArg);
		}
		return 0;

		int32_t Parcel::readInt32() const
		{
		return readAligned<int32_t>();
		}


		status_t Parcel::readInt64(int64_t *pArg) const
		{
		if ((mDataPos+sizeof(int64_t)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(int64_t);
		pArg = reinterpret_cast<const int64_t*>(data);
		LOGV("readInt64 Setting data pos of %p to %d\n", this, mDataPos);
		return NO_ERROR;
		} else {
		return NOT_ENOUGH_DATA;
		}
		return readAligned(pArg);
		}


		int64_t Parcel::readInt64() const
		{
		if ((mDataPos+sizeof(int64_t)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(int64_t);
		LOGV("readInt64 Setting data pos of %p to %d\n", this, mDataPos);
		return reinterpret_cast<const int64_t>(data);
		}
		return 0;
		return readAligned<int64_t>();
		}

		status_t Parcel::readFloat(float *pArg) const
		{
		if ((mDataPos+sizeof(float)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(float);
		LOGV("readFloat Setting data pos of %p to %d\n", this, mDataPos);
		pArg = reinterpret_cast<const float*>(data);
		return NO_ERROR;
		} else {
		return NOT_ENOUGH_DATA;
		}
		return readAligned(pArg);
		}


		float Parcel::readFloat() const
		{
		if ((mDataPos+sizeof(float)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(float);
		LOGV("readFloat Setting data pos of %p to %d\n", this, mDataPos);
		return reinterpret_cast<const float>(data);
		}
		return 0;
		return readAligned<float>();
		}

		status_t Parcel::readDouble(double *pArg) const
		{
		if ((mDataPos+sizeof(double)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(double);
		LOGV("readDouble Setting data pos of %p to %d\n", this, mDataPos);
		pArg = reinterpret_cast<const double*>(data);
		return NO_ERROR;
		} else {
		return NOT_ENOUGH_DATA;
		}
		return readAligned(pArg);
		}


		double Parcel::readDouble() const
		{
		if ((mDataPos+sizeof(double)) <= mDataSize) {
		const void* data = mData+mDataPos;
		mDataPos += sizeof(double);
		LOGV("readDouble Setting data pos of %p to %d\n", this, mDataPos);
		return reinterpret_cast<const double>(data);
		return readAligned<double>();
		}

		status_t Parcel::readIntPtr(intptr_t *pArg) const
		{
		return readAligned(pArg);
		}
		return 0;


		intptr_t Parcel::readIntPtr() const
		{
		return readAligned<intptr_t>();
		}

media/libmedia/IOMX.cpp

+44 −54

Original line number	Diff line number	Diff line
		@@ -45,16 +45,6 @@ sp<IOMXRenderer> IOMX::createRenderer(
		displayWidth, displayHeight);
		}

		static void readVoidStar(const Parcel parcel) {
		// FIX if sizeof(void *) != sizeof(int32)
		return (void *)parcel->readInt32();
		}

		static void writeVoidStar(void x, Parcel parcel) {
		// FIX if sizeof(void *) != sizeof(int32)
		parcel->writeInt32((int32_t)x);
		}

		class BpOMX : public BpInterface<IOMX> {
		public:
		BpOMX(const sp<IBinder> &impl)
		@@ -86,7 +76,7 @@ public:

		status_t err = reply.readInt32();
		if (err == OK) {
		*node = readVoidStar(&reply);
		node = (void)reply.readIntPtr();
		} else {
		*node = 0;
		}
		@@ -97,7 +87,7 @@ public:
		virtual status_t free_node(node_id node) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		remote()->transact(FREE_NODE, data, &reply);

		return reply.readInt32();
		@@ -107,7 +97,7 @@ public:
		node_id node, OMX_COMMANDTYPE cmd, OMX_S32 param) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(cmd);
		data.writeInt32(param);
		remote()->transact(SEND_COMMAND, data, &reply);
		@@ -120,7 +110,7 @@ public:
		void *params, size_t size) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(index);
		data.writeInt32(size);
		data.write(params, size);
		@@ -141,7 +131,7 @@ public:
		const void *params, size_t size) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(index);
		data.writeInt32(size);
		data.write(params, size);
		@@ -155,7 +145,7 @@ public:
		void *params, size_t size) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(index);
		data.writeInt32(size);
		data.write(params, size);
		@@ -176,7 +166,7 @@ public:
		const void *params, size_t size) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(index);
		data.writeInt32(size);
		data.write(params, size);
		@@ -190,7 +180,7 @@ public:
		buffer_id *buffer) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(port_index);
		data.writeStrongBinder(params->asBinder());
		remote()->transact(USE_BUFFER, data, &reply);
		@@ -202,7 +192,7 @@ public:
		return err;
		}

		*buffer = readVoidStar(&reply);
		buffer = (void)reply.readIntPtr();

		return err;
		}
		@@ -212,7 +202,7 @@ public:
		buffer_id *buffer) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(port_index);
		data.writeInt32(size);
		remote()->transact(ALLOC_BUFFER, data, &reply);
		@@ -224,7 +214,7 @@ public:
		return err;
		}

		*buffer = readVoidStar(&reply);
		buffer = (void)reply.readIntPtr();

		return err;
		}
		@@ -234,7 +224,7 @@ public:
		buffer_id *buffer) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(port_index);
		data.writeStrongBinder(params->asBinder());
		remote()->transact(ALLOC_BUFFER_WITH_BACKUP, data, &reply);
		@@ -246,7 +236,7 @@ public:
		return err;
		}

		*buffer = readVoidStar(&reply);
		buffer = (void)reply.readIntPtr();

		return err;
		}
		@@ -255,9 +245,9 @@ public:
		node_id node, OMX_U32 port_index, buffer_id buffer) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeInt32(port_index);
		writeVoidStar(buffer, &data);
		data.writeIntPtr((intptr_t)buffer);
		remote()->transact(FREE_BUFFER, data, &reply);

		return reply.readInt32();
		@@ -267,7 +257,7 @@ public:
		node_id node, const sp<IOMXObserver> &observer) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeStrongBinder(observer->asBinder());
		remote()->transact(OBSERVE_NODE, data, &reply);

		@@ -277,8 +267,8 @@ public:
		virtual void fill_buffer(node_id node, buffer_id buffer) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		writeVoidStar(buffer, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeIntPtr((intptr_t)buffer);
		remote()->transact(FILL_BUFFER, data, &reply, IBinder::FLAG_ONEWAY);
		}

		@@ -289,8 +279,8 @@ public:
		OMX_U32 flags, OMX_TICKS timestamp) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		writeVoidStar(buffer, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeIntPtr((intptr_t)buffer);
		data.writeInt32(range_offset);
		data.writeInt32(range_length);
		data.writeInt32(flags);
		@@ -304,7 +294,7 @@ public:
		OMX_INDEXTYPE *index) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
		writeVoidStar(node, &data);
		data.writeIntPtr((intptr_t)node);
		data.writeCString(parameter_name);

		remote()->transact(GET_EXTENSION_INDEX, data, &reply);
		@@ -379,7 +369,7 @@ status_t BnOMX::onTransact(
		status_t err = allocate_node(data.readCString(), &node);
		reply->writeInt32(err);
		if (err == OK) {
		writeVoidStar(node, reply);
		reply->writeIntPtr((intptr_t)node);
		}

		return NO_ERROR;
		@@ -389,7 +379,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();

		reply->writeInt32(free_node(node));

		@@ -400,7 +390,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();

		OMX_COMMANDTYPE cmd =
		static_cast<OMX_COMMANDTYPE>(data.readInt32());
		@@ -415,7 +405,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_INDEXTYPE index = static_cast<OMX_INDEXTYPE>(data.readInt32());

		size_t size = data.readInt32();
		@@ -442,7 +432,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_INDEXTYPE index = static_cast<OMX_INDEXTYPE>(data.readInt32());

		size_t size = data.readInt32();
		@@ -457,7 +447,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_INDEXTYPE index = static_cast<OMX_INDEXTYPE>(data.readInt32());

		size_t size = data.readInt32();
		@@ -484,7 +474,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_INDEXTYPE index = static_cast<OMX_INDEXTYPE>(data.readInt32());

		size_t size = data.readInt32();
		@@ -499,7 +489,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_U32 port_index = data.readInt32();
		sp<IMemory> params =
		interface_cast<IMemory>(data.readStrongBinder());
		@@ -509,7 +499,7 @@ status_t BnOMX::onTransact(
		reply->writeInt32(err);

		if (err == OK) {
		writeVoidStar(buffer, reply);
		reply->writeIntPtr((intptr_t)buffer);
		}

		return NO_ERROR;
		@@ -519,7 +509,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_U32 port_index = data.readInt32();
		size_t size = data.readInt32();

		@@ -528,7 +518,7 @@ status_t BnOMX::onTransact(
		reply->writeInt32(err);

		if (err == OK) {
		writeVoidStar(buffer, reply);
		reply->writeIntPtr((intptr_t)buffer);
		}

		return NO_ERROR;
		@@ -538,7 +528,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_U32 port_index = data.readInt32();
		sp<IMemory> params =
		interface_cast<IMemory>(data.readStrongBinder());
		@@ -550,7 +540,7 @@ status_t BnOMX::onTransact(
		reply->writeInt32(err);

		if (err == OK) {
		writeVoidStar(buffer, reply);
		reply->writeIntPtr((intptr_t)buffer);
		}

		return NO_ERROR;
		@@ -560,9 +550,9 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		OMX_U32 port_index = data.readInt32();
		buffer_id buffer = readVoidStar(&data);
		buffer_id buffer = (void*)data.readIntPtr();
		reply->writeInt32(free_buffer(node, port_index, buffer));

		return NO_ERROR;
		@@ -572,7 +562,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		sp<IOMXObserver> observer =
		interface_cast<IOMXObserver>(data.readStrongBinder());
		reply->writeInt32(observe_node(node, observer));
		@@ -584,8 +574,8 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		buffer_id buffer = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		buffer_id buffer = (void*)data.readIntPtr();
		fill_buffer(node, buffer);

		return NO_ERROR;
		@@ -595,8 +585,8 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		buffer_id buffer = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		buffer_id buffer = (void*)data.readIntPtr();
		OMX_U32 range_offset = data.readInt32();
		OMX_U32 range_length = data.readInt32();
		OMX_U32 flags = data.readInt32();
		@@ -613,7 +603,7 @@ status_t BnOMX::onTransact(
		{
		CHECK_INTERFACE(IOMX, data, reply);

		node_id node = readVoidStar(&data);
		node_id node = (void*)data.readIntPtr();
		const char *parameter_name = data.readCString();

		OMX_INDEXTYPE index;
		@@ -711,7 +701,7 @@ public:
		virtual void render(IOMX::buffer_id buffer) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMXRenderer::getInterfaceDescriptor());
		writeVoidStar(buffer, &data);
		data.writeIntPtr((intptr_t)buffer);

		// NOTE: Do NOT make this a ONE_WAY call, it must be synchronous
		// so that the caller knows when to recycle the buffer.
		@@ -728,7 +718,7 @@ status_t BnOMXRenderer::onTransact(
		{
		CHECK_INTERFACE(IOMXRenderer, data, reply);

		IOMX::buffer_id buffer = readVoidStar(&data);
		IOMX::buffer_id buffer = (void*)data.readIntPtr();

		render(buffer);