Remove NVidia licensed KD and OMX files.

In case we still need these extensions, add them manually.

3 files changed, 0 insertions, 815 deletions

diff --git a/make/stub_includes/openmax/NVOMX_ComponentBase.h b/make/stub_includes/openmax/NVOMX_ComponentBase.h
deleted file mode 100644
index 00d1d1217..000000000
--- a/make/stub_includes/openmax/NVOMX_ComponentBase.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
- *
- * NVIDIA Corporation and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an
- * express license agreement from NVIDIA Corporation is strictly prohibited.
- */
-
-/**
- * @defgroup nv_omx_il_comp_base NVIDIA OMX Component Base Interface
- *   
- * This is the NVIDIA OMX component base interface. See also \link samp_impl Sample
- * Implementations\endlink in this document.
- *
- * @ingroup nv_omx_il_core 
- * @{
- */
-
-#ifndef _NVOMX_ComponentBase_h_
-#define _NVOMX_ComponentBase_h_
-
-#include <OMX_Core.h>
-#include <OMX_Component.h>
-
-#define NVOMX_COMPONENT_MAX_PORTS 8 /** Max number of ports NVOMX_Component may have. */
-
-/**
-   Defines a simple port abstraction used in NVOMX_Component.
- */
-typedef struct NVOMX_Port 
-{
-    OMX_PARAM_PORTDEFINITIONTYPE *pPortDef; /**< Holds a pointer to the OMX port definition
-                                                for this port */
-    OMX_AUDIO_PARAM_PCMMODETYPE  *pPCMMode; /**< Holds a pointer to the PCM description of this component, if pertinent. */
-    OMX_BUFFERHEADERTYPE         *pCurrentBufferHdr; /**< Holds a pointer to the current
-                                                         buffer on this port, if any. */
-} NVOMX_Port;
-
-/**
-   Defines a simple OMX component template that abstracts most of the 
-   complexity away from the user.
-
-   To use:
-   -# Call NVOMX_CreateComponent() from the OMX component's init functions to create this 
-   structure.
-   -# Call NVOMX_AddRole() to set what OMX roles this component will fill.
-   -# Call NVOMX_InitPort() once for each port on this component to setup the ports.
-   -# Fill in the function pointers in the NVOMX_Component structure as 
-   appropriate -- at a minimum _NVOMX_Component::WorkerFunction and
-   _NVOMX_Component::DeInit must point to valid functions. 
- */
-typedef struct _NVOMX_Component NVOMX_Component;
-/**
-   Defines a simple OMX component.
- */
-struct _NVOMX_Component
-{
-    OMX_PTR     pBase; /**< Internal pointer, do not touch. */
-
-    OMX_U32     nPorts; /**< Holds the number of valid ports for this component. */
-    NVOMX_Port  pPorts[NVOMX_COMPONENT_MAX_PORTS]; /**< Holds an array of port structures
-                                                       for this component. */
-
-    OMX_PTR     pComponentData; /**< An opaque pointer to any data this component desires 
-                                    to keep track of. */
-
-    /**
-       Frees any remaining memory/resources
-       allocated by the component.
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @retval OMX_ERRORTYPE
-           This generally should not have an error, but should return as appropriate.
-     */
-    OMX_ERRORTYPE (*DeInit)(NVOMX_Component *pComp);
-
-    /**
-       Called whenever an OMX_GetParameter has been done on the
-       component.
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @param [in] nIndex
-           Specifies what type of configuration this is.
-       @param [inout] pComponentParameterStructure
-           Any data associated with this parameter call.
-       @param [out] bHandled
-           OMX_TRUE if this call was processed, otherwise OMX_FALSE.
-       @retval OMX_ERRORTYPE
-           Returns an appropriate error.
-     */
-    OMX_ERRORTYPE (*GetParameter)(NVOMX_Component *pComp, 
-                                  OMX_INDEXTYPE nParamIndex, 
-                                  OMX_PTR pComponentParameterStructure, 
-                                  OMX_BOOL *bHandled);
-
-    /**
-       Called whenever an OMX_SetParameter has been done on the 
-       component.
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @param [in] nIndex
-           Specifies what type of configuration this is.
-       @param [in] pComponentParameterStructure
-           Any data associated with this parameter call.
-       @param [out] bHandled
-           OMX_TRUE if this call was processed, otherwise OMX_FALSE.
-       @retval OMX_ERRORTYPE
-           Returns an appropriate error.
-     */
-    OMX_ERRORTYPE (*SetParameter)(NVOMX_Component *pComp, 
-                                  OMX_INDEXTYPE nIndex,
-                                  OMX_PTR pComponentParameterStructure,
-                                  OMX_BOOL *bHandled);
-
-    /**
-       Called whenever an OMX_GetConfig has been done on the component.
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @param [in] nIndex
-           Specifies what type of configuration this is.
-       @param [inout] pComponentConfigStructure
-           Any data associated with this config call.
-       @param [out] bHandled
-           OMX_TRUE if this call was processed, otherwise OMX_FALSE.
-       @retval OMX_ERRORTYPE
-           Returns an appropriate error.
-     */
-    OMX_ERRORTYPE (*GetConfig)(NVOMX_Component *pComp,
-                               OMX_INDEXTYPE nIndex,
-                               OMX_PTR pComponentConfigStructure,
-                               OMX_BOOL *bHandled);
-
-    /**
-       Called whenever an OMX_SetConfig has been done on the component.
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @param [in] nIndex
-           Specifies what type of configuration this is.
-       @param [in] pComponentConfigStructure
-           Any data associated with this config call.
-       @param [out] bHandled
-           OMX_TRUE if this call was processed, otherwise OMX_FALSE.
-       @retval OMX_ERRORTYPE
-           Returns an appropriate error.
-     */
-    OMX_ERRORTYPE (*SetConfig)(NVOMX_Component *pComp,
-                               OMX_INDEXTYPE nIndex,
-                               OMX_PTR pComponentConfigStructure,
-                               OMX_BOOL *bHandled);
-
-    /**
-       Called whenever all ports of this component have a
-       valid buffer and there needs to be work done to process them.
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @param [out] pbMoreWork
-           OMX_TRUE if there is still more work to be done on a given
-           input buffer.
-       @retval OMX_ERRORTYPE
-           This generally should not fail, but returns an appropriate error type.
-     */
-    OMX_ERRORTYPE (*WorkerFunction)(NVOMX_Component *pComp,
-                                    OMX_BOOL *pbMoreWork);
-
-    /**
-       Called on the transition to OMX_StateIdle (from Loaded).
-       Allocates/acquires any resources in this function. 
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @retval OMX_ERRORTYPE
-           This generally should not fail, but returns an appropriate error type.
-       @retval OMX_ErrorNotReady
-           If OMX_ErrorNotReady is returned, the component core will retry the 
-           transtion periodically until it succeeds. If any other error than 
-           OMX_ErrorNone is returned, the error will be sent back to the component.
-     */
-    OMX_ERRORTYPE (*AcquireResources)(NVOMX_Component *pComp);
-
-    /**
-       Called when this component needs to release its hold
-       on any resources acquired by _NVOMX_Component::AcquireResources.
-
-       @param [in] pComp
-           A pointer to the NVOMX_Component structure.
-       @retval OMX_ERRORTYPE
-           This generally should not fail, but returns an appropriate error type.
-     */
-    OMX_ERRORTYPE (*ReleaseResources)(NVOMX_Component *pComp);
-
-};
-
-/** 
-   Creates an NVOMX_Component.
-
-   @param [in] hComponent
-       A pointer to the OMX handle passed into the component's init function.
-   @param [in] nPorts
-       Specifies how many ports this component will have.
-   @param [in] name
-       The name of this component, must be unique
-   @param [out] ppComp
-       A pointer to the created NVOMX_Component; use this for calling any other
-       NVOMX_Component functions.
-   @retval OMX_ERRORTYPE
-       Returns an appropriate error.
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_CreateComponent(
-    OMX_HANDLETYPE hComponent,
-    OMX_U32 nPorts,
-    OMX_STRING name,
-    NVOMX_Component **ppComp);
-
-/**
-   Adds a role name to this component.
-
-   @param [in] pComp
-       A pointer to the NVOMX_Component structure.
-   @param [in] roleName
-       A pointer to a static char string with the role name.
-   @retval OMX_ERRORTYPE
-       Returns an appropriate error.
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_AddRole(
-    NVOMX_Component *pComp,
-    OMX_STRING roleName);
-
-/**
-   Registers an index extension with this component.
-
-   @param [in] pComp
-       A pointer to the NVOMX_Component structure.
-   @param [in] indexName
-       A pointer to a static char string with the role name.
-   @param [in] indexType
-       The index to register
-   @retval OMX_ERRORTYPE
-       Returns an appropriate error.
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_AddExtensionIndex(
-    NVOMX_Component *pComp,
-    OMX_STRING indexName,
-    OMX_INDEXTYPE indexType);
-
-/**
-   Creates a port structure.
-
-   @param [in] pComp
-       A pointer to the NVOMX_Component structure.
-   @param [in] nPort
-       Specifies the port number to create.
-   @param [in] eDir
-       Specifies the direction (input/output) of the port.
-   @param [in] nBufferCount
-       Specifies the minimum number of buffers to create on this port.
-   @param [in] nBufferSize
-       Specifies the minimum buffer size to create.
-   @param [in] eDomain
-       Specifies what port type (other, image, video, audio) this port will be.
-   @param [in] pFormat
-       A pointer to the format type of the port. May be one of type
-       OMX_OTHER_FORMATTYPE, OMX_AUDIO_CODINGTYPE, OMX_VIDEO_CODINGTYPE, or
-       OMX_IMAGE_CODINGTYPE.
-   @retval OMX_ERRORTYPE
-       Returns an appropriate error.
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_InitPort(
-    NVOMX_Component *pComp,
-    OMX_U32 nPort, 
-    OMX_DIRTYPE eDir,
-    OMX_U32 nBufferCount,
-    OMX_U32 nBufferSize,
-    OMX_PORTDOMAINTYPE eDomain,
-    OMX_PTR pFormat);
-
-/**
-   Copies any buffer metadata (flags, marks, etc.) from one port to another.
-
-   @param [in] pComp
-       A pointer to the NVOMX_Component structure.
-   @param [in] nSourcePort
-       Specifies the source port from which to copy metadata.
-   @param [in] nDestPort
-       Specifies the port to which to copy metadata.
-   @retval OMX_ERRORTYPE
-       Returns an appropriate error.
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_CopyBufferMetadata(
-    NVOMX_Component *pComp,
-    OMX_U32 nSourcePort,
-    OMX_U32 nDestPort);
-
-/**
-   Gets an empty buffer to an input port.
-   The buffer will be queued for delivery either to the tunneled component
-   associated with the given port, or back to the IL client via the
-   EmptyBufferDone callback.
-
-   @param [in] pComp
-       A pointer to the NVOMX_Component structure.
-   @param [in] nPort
-       Specifies the input port in which to return the buffer.
-   @param [in] pBuffer
-       Specifies the buffer to return to the input port.
-   @retval OMX_ERRORTYPE
-       Returns an appropriate error.
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_ReleaseEmptyBuffer(
-    NVOMX_Component *pComp,
-    OMX_U32 nPort,
-    OMX_BUFFERHEADERTYPE *pBuffer);
-
-/**
-   Delivers a full buffer to an output port.
-   The buffer will be queued for delivery either to the tunneled component
-   associated with the given port, or back to the IL client via the
-   FillBufferDone callback.
-   
-   @param [in] pComp
-       A pointer to the NVOMX_Component structure.
-   @param [in] nPort
-       Specifies the output port in which to deliver the buffer.
-   @param [in] pBuffer
-       Specifies the buffer to deliver to the output port.
-   @retval OMX_ERRORTYPE
-       Returns an appropriate error.
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_DeliverFullBuffer(
-    NVOMX_Component *pComp,
-    OMX_U32 nPort,
-    OMX_BUFFERHEADERTYPE *pBuffer);
-
-#endif
-/** @} */
-
diff --git a/make/stub_includes/openmax/NVOMX_ComponentRegister.h b/make/stub_includes/openmax/NVOMX_ComponentRegister.h
deleted file mode 100644
index 550dd5912..000000000
--- a/make/stub_includes/openmax/NVOMX_ComponentRegister.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
- *
- * NVIDIA Corporation and its licensors retain all intellectual property 
- * and proprietary rights in and to this software, related documentation 
- * and any modifications thereto.  Any use, reproduction, disclosure or 
- * distribution of this software and related documentation without an 
- * express license agreement from NVIDIA Corporation is strictly prohibited.
- */
-
-/** 
- * @file
- * <b>NVIDIA Tegra ODM Kit:
- *         OMX Component Register Interface</b>
- *
- * @b Description: Defines the interface to register/deregister OMX components.
- * 
- */
-
-#ifndef NVOMX_ComponentRegister_h
-#define NVOMX_ComponentRegister_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <OMX_Core.h>
-
-/**
- * @defgroup nv_omx_il_comp_reg NVIDIA OMX Component Register Interface
- *   
- * This is the NVIDIA OMX component register interface.
- *
- * @ingroup nv_omx_il_core 
- * @{
- */
-
-/** 
- * Dynamically registers a component with the core.
- * The core should return from this call in 20 msec.
- *
- * @pre OMX_Init()
- *
- * @param [in] pComponentReg A pointer to a component register
- *  structure. Both \c pName and \c pInitialize values of this structure
- *  shall be non-null. The \c pName value must be unique, otherwise an
- *  error is returned.
- * @retval OMX_ErrorNone If successful, or the appropriate OMX error code.
- * @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_RegisterComponent(
-    OMX_IN  OMX_COMPONENTREGISTERTYPE *pComponentReg);
-
-/** 
- * Deregisters a component with the core. 
- * A dynamically registered component is not required to be deregistered
- * with a call to this function. OMX_DeInit() will deregister
- * all components.
- * The core should return from this call in 20 msec.
- * 
- * @pre OMX_Init()
- *
- * @param [in] pComponentName The name of the component to deregister.
- * @retval OMX_ErrorNone If successful, or the appropriate OMX error code.
- * @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY NVOMX_DeRegisterComponent(
-    OMX_IN OMX_STRING pComponentName);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/** @} */
-/* File EOF */
-
diff --git a/make/stub_includes/openmax/NVOMX_IndexExtensions.h b/make/stub_includes/openmax/NVOMX_IndexExtensions.h
deleted file mode 100644
index 5a312f255..000000000
--- a/make/stub_includes/openmax/NVOMX_IndexExtensions.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/* Copyright (c) 2007 NVIDIA Corporation.  All rights reserved.
- *
- * NVIDIA Corporation and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an
- * express license agreement from NVIDIA Corporation is strictly prohibited.
- */
-
-#ifndef _NVOMX_IndexExtensions_h_
-#define _NVOMX_IndexExtensions_h_
-
-#include <OMX_Core.h>
-#include <OMX_Component.h>
-
-#include "OMX_Core.h"
-
-/** representation of timeout values, in milliseconds */
-typedef OMX_U32 NvxTimeMs;
-/** maximum timeout value, used to mean never timeout */
-#define NVX_TIMEOUT_NEVER   0xffffffff
-/** minimum timeout value */
-#define NVX_TIMEOUT_MIN     0
-
-typedef float NVX_F32;
-
-#define NVX_INDEX_PARAM_FILENAME "OMX.Nvidia.index.param.filename" /**< Filename parameter for source, demux, and sink components that read/write files. */
-typedef struct NVX_PARAM_FILENAME {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< NVX extensions specification version information (1.0.0.0)*/
-    OMX_STRING pFilename;       /**< name of file as supported by stdio implementation */
-} NVX_PARAM_FILENAME;
-
-#define NVX_INDEX_PARAM_DURATION "OMX.Nvidia.index.param.duration"
-typedef struct NVX_PARAM_DURATION {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_TICKS nDuration;  /** Duration in us */
-} NVX_PARAM_DURATION;
-
-typedef enum
-{
-    NvxStreamType_NONE,
-    NvxStreamType_MPEG4,
-    NvxStreamType_H264,
-    NvxStreamType_H263,
-    NvxStreamType_WMV,
-    NvxStreamType_JPG,
-    NvxStreamType_MP3,
-    NvxStreamType_WAV,
-    NvxStreamType_AAC,
-    NvxStreamType_AACSBR,
-    NvxStreamType_BSAC,
-    NvxStreamType_WMA,
-    NvxStreamType_WMAPro,
-    NvxStreamType_WMALossless,
-    NvxStreamType_AMRWB,
-    NvxStreamType_AMRNB,
-    NvxStreamType_VORBIS
-} ENvxStreamType;
-
-#define NVX_INDEX_PARAM_STREAMTYPE "OMX.Nvidia.index.param.streamtype"
-typedef struct NVX_PARAM_STREAMTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPort;
-    ENvxStreamType eStreamType;
-} NVX_PARAM_STREAMTYPE;
-
-typedef enum
-{
-    NvxRecordingMode_Enable = 1,
-    NvxRecordingMode_EnableExclusive,
-    NvxRecordingMode_Disable,
-    NvxRecordingMode_Force32 = 0x7FFFFFFF
-} ENvxRecordingMode;
-
-#define NVX_INDEX_PARAM_RECORDINGMODE "OMX.Nvidia.index.param.recordingmode"
-typedef struct NVX_PARAM_RECORDINGMODE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    ENvxRecordingMode RecordingMode;
-} NVX_PARAM_RECORDINGMODE;
-
-#define NVX_INDEX_PARAM_CHANNELID "OMX.Nvidia.index.param.channelid"
-typedef struct NVX_PARAM_CHANNELID
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 ChannelID;
-} NVX_PARAM_CHANNELID;
-
-#define NVX_INDEX_PARAM_LOWMEMMODE "OMX.Nvidia.index.param.lowmemmode"
-typedef struct NVX_PARAM_LOWMEMMODE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bLowMemMode;
-} NVX_PARAM_LOWMEMMODE;
-
-typedef enum
-{
-    NvxMetadata_Artist,
-    NvxMetadata_Album,
-    NvxMetadata_Genre,
-    NvxMetadata_Title,
-    NvxMetadata_Year,
-    NvxMetadata_TrackNum,
-    NvMMetadata_Encoded,
-    NvxMetadata_Comment,
-    NvxMetadata_Composer,
-    NvxMetadata_Publisher,
-    NvxMetadata_OriginalArtist,
-    NvxMetadata_AlbumArtist,
-    NvxMetadata_Copyright,
-    NvxMetadata_Url,
-    NvxMetadata_BPM,
-    NvxMetadata_CoverArt,
-    NvxMetadata_CoverArtURL,
-    NvxMetadata_MAX = 0x7FFFFFFF
-} ENvxMetadataType;
-
-/* Charset define to extend OMX_METADATACHARSETTYPE for a U32 type */
-#define NVOMX_MetadataCharsetU32    0x10000000
-#define NVOMX_MetadataFormatJPEG    0x10000001
-#define NVOMX_MetadataFormatPNG     0x10000002
-#define NVOMX_MetadataFormatBMP     0x10000003
-#define NVOMX_MetadataFormatUnknown 0x10000004
-
-/* If specified metadata not found, returns empty string.
- * or OMX_ErrorInsufficientResources if sValueStr is too small */
-#define NVX_INDEX_CONFIG_QUERYMETADATA "OMX.Nvidia.index.config.querymetadata"
-typedef struct NVX_CONFIG_QUERYMETADATA {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    ENvxMetadataType eType;
-    OMX_STRING sValueStr;
-    OMX_U32 nValueLen;
-    OMX_METADATACHARSETTYPE eCharSet;
-} NVX_CONFIG_QUERYMETADATA;
-
-#define NVX_INDEX_CONFIG_KEEPASPECT "OMX.Nvidia.index.config.keepaspect"
-typedef struct NVX_CONFIG_KEEPASPECT {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bKeepAspect;
-} NVX_CONFIG_KEEPASPECT;
-
-#define NVX_INDEX_CONFIG_ULPMODE "OMX.Nvidia.index.config.ulpmode"
-typedef struct NVX_CONFIG_ULPMODE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL enableUlpMode;
-    OMX_U32 kpiMode;
-} NVX_CONFIG_ULPMODE;
-
-#define NVX_INDEX_CONFIG_AUDIO_OUTPUT "OMX.Nvidia.index.config.audio.output"
-typedef enum NVX_AUDIO_OUTPUTTYPE {
-    NVX_AUDIO_OutputI2S = 0,
-    NVX_AUDIO_OutputHdmi,
-    NVX_AUDIO_Force32 = 0x7FFFFFFF
-} NVX_AUDIO_OUTPUTTYPE;
-
-typedef struct NVX_CONFIG_AUDIOOUTPUT {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    NVX_AUDIO_OUTPUTTYPE eOutputType;
-} NVX_CONFIG_AUDIOOUTPUT;
-
-#define NVX_INDEX_CONFIG_WHITEBALANCEOVERRIDE "OMX.Nvidia.index.config.whitebalanceoverride"
-typedef struct NVX_CONFIG_WHITEBALANCEOVERRIDE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_S32  wbIlluminantOverride;
-    OMX_S32  wbGainAndColorCorrectionOverride[13];
-} NVX_CONFIG_WHITEBALANCEOVERRIDE;
-
-#define NVX_INDEX_CONFIG_PREVIEWENABLE "OMX.Nvidia.index.config.previewenable"
-
-#define NVX_INDEX_CONFIG_CAPTUREPAUSE "OMX.Nvidia.index.config.capturepause"
-
-#define NVX_INDEX_CONFIG_CONVERGEANDLOCK "OMX.Nvidia.index.config.convergeandlock"
-typedef struct NVX_CONFIG_CONVERGEANDLOCK
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_BOOL bUnlock;
-    OMX_BOOL bAutoFocus;
-    OMX_BOOL bAutoExposure;
-    OMX_BOOL bAutoWhiteBalance;
-    OMX_U32  nTimeOutMS;
-} NVX_CONFIG_CONVERGEANDLOCK;
-
-#define NVX_INDEX_CONFIG_PRECAPTURECONVERGE "OMX.Nvidia.index.config.precaptureconverge"
-typedef struct NVX_CONFIG_PRECAPTURECONVERGE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_BOOL bPrecaptureConverge;
-    OMX_BOOL bContinueDuringCapture;
-    OMX_U32  nTimeOutMS;
-} NVX_CONFIG_PRECAPTURECONVERGE;
-
-#define NVX_INDEX_CONFIG_AUTOFRAMERATE "OMX.Nvidia.index.config.autoframerate"
-typedef struct NVX_CONFIG_AUTOFRAMERATE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_BOOL bEnabled;
-    OMX_S32  low;
-    OMX_S32  high;
-} NVX_CONFIG_AUTOFRAMERATE;
-
-#define NVX_INDEX_CONFIG_CAMERARAWCAPTURE "OMX.Nvidia.index.config.camera.rawcapture"
-typedef struct NVX_CONFIG_CAMERARAWCAPTURE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_U32 nCaptureCount;
-    OMX_STRING Filename;
-} NVX_CONFIG_CAMERARAWCAPTURE;
-
-typedef enum
-{
-    NvxFlicker_Off,
-    NvxFlicker_Auto,
-    NvxFlicker_50HZ,
-    NvxFlicker_60HZ
-} ENvxFlickerType;
-#define NVX_INDEX_CONFIG_FLICKER "OMX.Nvidia.index.config.flicker"
-typedef struct NVX_CONFIG_FLICKER
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    ENvxFlickerType eFlicker;
-} NVX_CONFIG_FLICKER;
-
-// this is used for isp data dump
-#define NVX_INDEX_CONFIG_ISPDATA "OMX.Nvidia.index.config.ispdata"
-typedef struct NVX_CONFIG_ISPDATA
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    NVX_F32 ilData;
-    NVX_F32 ilData2;
-} NVX_CONFIG_ISPDATA;
-
-#define NVX_INDEX_PARAM_VIDEO_ENCODE_PROPERTY "OMX.Nvidia.index.param.video.encode.prop"
-typedef enum NVX_VIDEO_ERROR_RESILIENCY_LEVEL_TYPE {
-    NVX_VIDEO_ErrorResiliency_None = 0,
-    NVX_VIDEO_ErrorResiliency_Low,
-    NVX_VIDEO_ErrorResiliency_High,
-    NVX_VIDEO_ErrorResiliency_Invalid = 0x7FFFFFFF
-} NVX_VIDEO_ERROR_RESILIENCY_LEVEL_TYPE;
-
-typedef enum NVX_VIDEO_APPLICATION_TYPE {
-    NVX_VIDEO_Application_Camcorder = 0,
-    NVX_VIDEO_Application_VideoTelephony,
-    NVX_VIDEO_Application_Invalid = 0x7FFFFFFF
-} NVX_VIDEO_APPLICATION_TYPE;
-
-/*new parameter to fine tune video encoder configuration*/
-typedef struct NVX_PARAM_VIDENCPROPERTY
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    
-    NVX_VIDEO_APPLICATION_TYPE eApplicationType;
-    NVX_VIDEO_ERROR_RESILIENCY_LEVEL_TYPE eErrorResiliencyLevel;
-} NVX_PARAM_VIDENCPROPERTY;
-
-#define NVX_INDEX_PARAM_VIDEO_ENCODE_STRINGENTBITRATE "OMX.Nvidia.index.param.video.encode.stringentbitrate"
-
-#define NVX_INDEX_PARAM_OTHER_3GPMUX_BUFFERCONFIG  "OMX.Nvidia.index.param.other.3gpmux.bufferconfig"
-typedef struct NVX_PARAM_OTHER_3GPMUX_BUFFERCONFIG
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_BOOL bUseCache;
-    OMX_U32 nBufferSize;
-    OMX_U32 nPageSize;
-} NVX_PARAM_OTHER_3GPMUX_BUFFERCONFIG;
-
-#define NVX_INDEX_CONFIG_THUMBNAIL "OMX.Nvidia.index.config.thumbnail"
-typedef struct NVX_CONFIG_THUMBNAIL
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_BOOL bEnabled;
-    OMX_U32 nWidth;
-    OMX_U32 nHeight;
-} NVX_CONFIG_THUMBNAIL;
-
-#define NVX_INDEX_CONFIG_PROFILE "OMX.Nvidia.index.config.profile"
-typedef struct NVX_CONFIG_PROFILE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    OMX_BOOL bProfile;
-    OMX_BOOL bVerbose;
-    OMX_BOOL bStubOutput;
-    OMX_U32  nForceLocale; // 0 - no, 1 -cpu, 2 - avp
-    OMX_U32  nNvMMProfile;
-    OMX_BOOL bNoAVSync;
-    OMX_BOOL enableUlpMode;
-    OMX_U32 ulpkpiMode;
-    OMX_S32  nAVSyncOffset;
-    OMX_BOOL bFlip;
-    OMX_U32  nFrameDrop;
-
-    OMX_BOOL bSanity;
-    OMX_U32  nAvgFPS;
-    OMX_U32  nTotFrameDrops;
-
-    // for camera
-    OMX_U64 nTSPreviewStart;
-    OMX_U64 nTSCaptureStart;
-    OMX_U64 nTSCaptureEnd;
-    OMX_U64 nTSPreviewEnd;
-    OMX_U32 nPreviewStartFrameCount;
-    OMX_U32 nPreviewEndFrameCount;
-    OMX_U32 nCaptureStartFrameCount;
-    OMX_U32 nCaptureEndFrameCount;
-
-} NVX_CONFIG_PROFILE;
-
-
-// put event extension here for now;
-typedef enum NVX_EVENTTYPE_ENUM {
-    NVX_EventVendorStartUnused = 0x70000000,
-    
-    NVX_EventCameraStart = (NVX_EventVendorStartUnused | 0xD00000),
-    NVX_EventCamera_AlgorithmsLocked           = NVX_EventCameraStart,
-    NVX_EventCamera_AutoFocusAchieved,
-    NVX_EventCamera_AutoExposureAchieved,
-    NVX_EventCamera_AutoWhiteBalanceAchieved,
-    NVX_EventCamera_AutoFocusTimedOut,
-    NVX_EventCamera_AutoExposureTimedOut,
-    NVX_EventCamera_AutoWhiteBalanceTimedOut,
-    NVX_EventCamera_CaptureAborted,
-    NVX_EventCamera_CaptureStarted,
-
-    NVX_EventCamera_StillCaptureReady,
-
-    NVX_EventMax = OMX_EventMax,
-} NVX_EVENTTYPE;
-
-
-// Allow manual override on WinA to permit power optimizations from client side
-typedef enum
-{
-    NvxWindow_A = 0,
-    NvxWindow_MAX = 0x7FFFFFFF
-} ENvxWindowType;
-
-typedef enum
-{
-    NvxWindowAction_TurnOn = 0,
-    NvxWindowAction_TurnOff,
-    NvxWindowAction_MAX = 0x7FFFFFFF
-} ENvxWindowDispActionType;
-
-#define NVX_INDEX_CONFIG_WINDOW_DISP_OVERRIDE "OMX.Nvidia.index.config.windisp"
-typedef struct NVX_CONFIG_WINDOWOVERRIDE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-
-    ENvxWindowType eWindow;
-    ENvxWindowDispActionType eAction;
-} NVX_CONFIG_WINDOWOVERRIDE;
-
-#endif
-