Merge "Fix misc-macro-parentheses warnings in openmax." am: cb68066d06 am:... (f27b1f18) · Commits · e / os / android_frameworks_native

include/media/openmax/OMX_Core.h

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -735,7 +735,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	pComponentVersion, \		pComponentVersion, \
	pSpecVersion, \		pSpecVersion, \
	pComponentUUID) \		pComponentUUID) \
	((OMX_COMPONENTTYPE*)hComponent)->GetComponentVersion( \		((OMX_COMPONENTTYPE*)(hComponent))->GetComponentVersion(\
	hComponent, \		hComponent, \
	pComponentName, \		pComponentName, \
	pComponentVersion, \		pComponentVersion, \
	@@ -795,7 +795,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	Cmd, \		Cmd, \
	nParam, \		nParam, \
	pCmdData) \		pCmdData) \
	((OMX_COMPONENTTYPE*)hComponent)->SendCommand( \		((OMX_COMPONENTTYPE*)(hComponent))->SendCommand( \
	hComponent, \		hComponent, \
	Cmd, \		Cmd, \
	nParam, \		nParam, \
	@@ -835,7 +835,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	hComponent, \		hComponent, \
	nParamIndex, \		nParamIndex, \
	pComponentParameterStructure) \		pComponentParameterStructure) \
	((OMX_COMPONENTTYPE*)hComponent)->GetParameter( \		((OMX_COMPONENTTYPE*)(hComponent))->GetParameter( \
	hComponent, \		hComponent, \
	nParamIndex, \		nParamIndex, \
	pComponentParameterStructure) /* Macro End */		pComponentParameterStructure) /* Macro End */
	@@ -874,7 +874,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	hComponent, \		hComponent, \
	nParamIndex, \		nParamIndex, \
	pComponentParameterStructure) \		pComponentParameterStructure) \
	((OMX_COMPONENTTYPE*)hComponent)->SetParameter( \		((OMX_COMPONENTTYPE*)(hComponent))->SetParameter( \
	hComponent, \		hComponent, \
	nParamIndex, \		nParamIndex, \
	pComponentParameterStructure) /* Macro End */		pComponentParameterStructure) /* Macro End */
	@@ -910,7 +910,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	hComponent, \		hComponent, \
	nConfigIndex, \		nConfigIndex, \
	pComponentConfigStructure) \		pComponentConfigStructure) \
	((OMX_COMPONENTTYPE*)hComponent)->GetConfig( \		((OMX_COMPONENTTYPE*)(hComponent))->GetConfig( \
	hComponent, \		hComponent, \
	nConfigIndex, \		nConfigIndex, \
	pComponentConfigStructure) /* Macro End */		pComponentConfigStructure) /* Macro End */
	@@ -946,7 +946,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	hComponent, \		hComponent, \
	nConfigIndex, \		nConfigIndex, \
	pComponentConfigStructure) \		pComponentConfigStructure) \
	((OMX_COMPONENTTYPE*)hComponent)->SetConfig( \		((OMX_COMPONENTTYPE*)(hComponent))->SetConfig( \
	hComponent, \		hComponent, \
	nConfigIndex, \		nConfigIndex, \
	pComponentConfigStructure) /* Macro End */		pComponentConfigStructure) /* Macro End */
	@@ -980,7 +980,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	hComponent, \		hComponent, \
	cParameterName, \		cParameterName, \
	pIndexType) \		pIndexType) \
	((OMX_COMPONENTTYPE*)hComponent)->GetExtensionIndex( \		((OMX_COMPONENTTYPE*)(hComponent))->GetExtensionIndex( \
	hComponent, \		hComponent, \
	cParameterName, \		cParameterName, \
	pIndexType) /* Macro End */		pIndexType) /* Macro End */
	@@ -1006,7 +1006,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	#define OMX_GetState( \		#define OMX_GetState( \
	hComponent, \		hComponent, \
	pState) \		pState) \
	((OMX_COMPONENTTYPE*)hComponent)->GetState( \		((OMX_COMPONENTTYPE*)(hComponent))->GetState( \
	hComponent, \		hComponent, \
	pState) /* Macro End */		pState) /* Macro End */

	@@ -1037,7 +1037,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	pAppPrivate, \		pAppPrivate, \
	nSizeBytes, \		nSizeBytes, \
	pBuffer) \		pBuffer) \
	((OMX_COMPONENTTYPE*)hComponent)->UseBuffer( \		((OMX_COMPONENTTYPE*)(hComponent))->UseBuffer( \
	hComponent, \		hComponent, \
	ppBufferHdr, \		ppBufferHdr, \
	nPortIndex, \		nPortIndex, \
	@@ -1079,7 +1079,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	nPortIndex, \		nPortIndex, \
	pAppPrivate, \		pAppPrivate, \
	nSizeBytes) \		nSizeBytes) \
	((OMX_COMPONENTTYPE*)hComponent)->AllocateBuffer( \		((OMX_COMPONENTTYPE*)(hComponent))->AllocateBuffer( \
	hComponent, \		hComponent, \
	ppBuffer, \		ppBuffer, \
	nPortIndex, \		nPortIndex, \
	@@ -1113,7 +1113,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	hComponent, \		hComponent, \
	nPortIndex, \		nPortIndex, \
	pBuffer) \		pBuffer) \
	((OMX_COMPONENTTYPE*)hComponent)->FreeBuffer( \		((OMX_COMPONENTTYPE*)(hComponent))->FreeBuffer( \
	hComponent, \		hComponent, \
	nPortIndex, \		nPortIndex, \
	pBuffer) /* Macro End */		pBuffer) /* Macro End */
	@@ -1144,7 +1144,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	#define OMX_EmptyThisBuffer( \		#define OMX_EmptyThisBuffer( \
	hComponent, \		hComponent, \
	pBuffer) \		pBuffer) \
	((OMX_COMPONENTTYPE*)hComponent)->EmptyThisBuffer( \		((OMX_COMPONENTTYPE*)(hComponent))->EmptyThisBuffer( \
	hComponent, \		hComponent, \
	pBuffer) /* Macro End */		pBuffer) /* Macro End */

	@@ -1174,7 +1174,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	#define OMX_FillThisBuffer( \		#define OMX_FillThisBuffer( \
	hComponent, \		hComponent, \
	pBuffer) \		pBuffer) \
	((OMX_COMPONENTTYPE*)hComponent)->FillThisBuffer( \		((OMX_COMPONENTTYPE*)(hComponent))->FillThisBuffer( \
	hComponent, \		hComponent, \
	pBuffer) /* Macro End */		pBuffer) /* Macro End */

	@@ -1216,7 +1216,7 @@ typedef struct OMX_TUNNELSETUPTYPE
	nPortIndex, \		nPortIndex, \
	pAppPrivate, \		pAppPrivate, \
	eglImage) \		eglImage) \
	((OMX_COMPONENTTYPE*)hComponent)->UseEGLImage( \		((OMX_COMPONENTTYPE*)(hComponent))->UseEGLImage( \
	hComponent, \		hComponent, \
	ppBufferHdr, \		ppBufferHdr, \
	nPortIndex, \		nPortIndex, \