Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev (1d5d637d) · Commits · e / os / android_frameworks_native

include/media/openmax/OMX_AsString.h

0 → 100644

+943 −0

File added.

Preview size limit exceeded, changes collapsed.

+293 −294

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@
		extern "C" {
		#endif /* __cplusplus */


		/* Each OMX header must include all required header files to allow the
		* header to compile without errors. The includes below are required
		* for this header file to compile successfully

+20 −22

Original line number	Diff line number	Diff line
		@@ -51,14 +51,12 @@
		extern "C" {
		#endif /* __cplusplus */


		/* Each OMX header must include all required header files to allow the
		* header to compile without errors. The includes below are required
		* for this header file to compile successfully
		*/
		#include <OMX_Types.h>


		/** The OMX_INDEXTYPE enumeration is used to select a structure when either
		* getting or setting parameters and/or configuration data. Each entry in
		* this enumeration maps to an OMX specified structure. When the

+91 −91

Original line number	Diff line number	Diff line
		@@ -107,9 +107,9 @@ typedef struct OMX_TIME_CONFIG_SEEKMODETYPE {
		/** Structure representing a time stamp used with the following configs
		* on the Clock Component (CC):
		*
		* OMX_IndexConfigTimeCurrentWallTime: query of the CC’s current wall
		* OMX_IndexConfigTimeCurrentWallTime: query of the CC's current wall
		* time
		* OMX_IndexConfigTimeCurrentMediaTime: query of the CC’s current media
		* OMX_IndexConfigTimeCurrentMediaTime: query of the CC's current media
		* time
		* OMX_IndexConfigTimeCurrentAudioReference and
		* OMX_IndexConfigTimeCurrentVideoReference: audio/video reference
		@@ -120,7 +120,7 @@ typedef struct OMX_TIME_CONFIG_SEEKMODETYPE {
		* OMX_BUFFERFLAG_STARTTIME set. It must use the timestamp
		* specified by that buffer for nStartTimestamp.
		*
		* It’s also used with the following config on components in general:
		* It's also used with the following config on components in general:
		*
		* OMX_IndexConfigTimePosition: IL client querying component position
		* (GetConfig) or commanding a component to seek to the given location
		@@ -264,7 +264,7 @@ typedef struct OMX_TIME_CONFIG_SCALETYPE {
		* scaling the media time */
		} OMX_TIME_CONFIG_SCALETYPE;

		/** Bits used to identify a clock port. Used in OMX_TIME_CONFIG_CLOCKSTATETYPE’s nWaitMask field */
		/** Bits used to identify a clock port. Used in OMX_TIME_CONFIG_CLOCKSTATETYPE's nWaitMask field */
		#define OMX_CLOCKPORT0 0x00000001
		#define OMX_CLOCKPORT1 0x00000002
		#define OMX_CLOCKPORT2 0x00000004