Merge tag 'android-5.1.1_r13' into cm-12.1 (93c657f8) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/include/OMXNodeInstance.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -142,12 +142,11 @@ private:
		OMX::buffer_id mID;
		};
		Vector<ActiveBuffer> mActiveBuffers;
		#ifdef __LP64__
		// for buffer ptr to buffer id translation
		Mutex mBufferIDLock;
		uint32_t mBufferIDCount;
		KeyedVector<OMX::buffer_id, OMX_BUFFERHEADERTYPE *> mBufferIDToBufferHeader;
		KeyedVector<OMX_BUFFERHEADERTYPE *, OMX::buffer_id> mBufferHeaderToBufferID;
		#endif

		// For debug support
		char *mName;

+0 −21

Original line number	Diff line number	Diff line
		@@ -1362,8 +1362,6 @@ void OMXNodeInstance::freeActiveBuffers() {
		}
		}

		#ifdef __LP64__

		OMX::buffer_id OMXNodeInstance::makeBufferID(OMX_BUFFERHEADERTYPE *bufferHeader) {
		if (bufferHeader == NULL) {
		return 0;
		@@ -1406,23 +1404,4 @@ void OMXNodeInstance::invalidateBufferID(OMX::buffer_id buffer) {
		mBufferIDToBufferHeader.removeItem(buffer);
		}

		#else

		OMX::buffer_id OMXNodeInstance::makeBufferID(OMX_BUFFERHEADERTYPE *bufferHeader) {
		return (OMX::buffer_id)bufferHeader;
		}

		OMX_BUFFERHEADERTYPE *OMXNodeInstance::findBufferHeader(OMX::buffer_id buffer) {
		return (OMX_BUFFERHEADERTYPE *)buffer;
		}

		OMX::buffer_id OMXNodeInstance::findBufferID(OMX_BUFFERHEADERTYPE *bufferHeader) {
		return (OMX::buffer_id)bufferHeader;
		}

		void OMXNodeInstance::invalidateBufferID(OMX::buffer_id buffer __unused) {
		}

		#endif

		} // namespace android