Package media/*/*.h headers as a headers lib: media_plugin_headers

Headers under frameworks/native/include/media serves as an interface
that is meant to be implemented by vendors. For example.
media/hardware/CryptoAPI.h is implemented under
vendor/widevine/libwvdrmengine/mediacrypto.

When building with BOARD_VNDK_VERSION, the headers are not accessible to
vendors since they have been included via the global include paths and
the paths are not available when building with BOARD_VNDK_VERSION.

So, we need to make a "headers library" for the media headers and modify
vendors to use the headers lib. Usually, we have been doing this by
moving the headers into a subdirectory (usually 'include') of a module
that implements the headers. But, this approach can't be used at this
time since the media headers are implemented by many modules.

The chosen solution is to a separate directory headers/media_plugin and
define a headers lib named media_plugin_headers there.

Note: frameworks/native/headers will now be the home for such
header-only libraries.

Bug: 63120269
Test: build
Change-Id: I67d625706b40d06c8f0602284fbcc1cc8b174c6f

25 files changed, 1 insertions, 10985 deletions

diff --git a/include/media b/include/media
new file mode 120000
index 0000000000..3e7da1c11f
--- /dev/null
+++ b/include/media
@@ -0,0 +1 @@
+../headers/media_plugin/media
\ No newline at end of file
diff --git a/include/media/cas/CasAPI.h b/include/media/cas/CasAPI.h
deleted file mode 100644
index 67f4511e65..0000000000
--- a/include/media/cas/CasAPI.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef CAS_API_H_
-#define CAS_API_H_
-
-#include <vector>
-#include <utils/String8.h>
-
-//  Loadable CasPlugin shared libraries should define the entry points
-//  as shown below:
-//
-//  extern "C" {
-//      extern android::CasFactory *createCasFactory();
-//      extern android::DescramblerFactory *createDescramblerFactory();
-//  }
-
-namespace android {
-
-struct CasPlugin;
-
-struct CasPluginDescriptor {
-    int32_t CA_system_id;
-    String8 name;
-};
-
-typedef std::vector<uint8_t> CasData;
-typedef std::vector<uint8_t> CasSessionId;
-typedef std::vector<uint8_t> CasEmm;
-typedef std::vector<uint8_t> CasEcm;
-typedef void (*CasPluginCallback)(
-        void *appData,
-        int32_t event,
-        int32_t arg,
-        uint8_t *data,
-        size_t size);
-
-struct CasFactory {
-    CasFactory() {}
-    virtual ~CasFactory() {}
-
-    // Determine if the plugin can handle the CA scheme identified by CA_system_id.
-    virtual bool isSystemIdSupported(
-            int32_t CA_system_id) const = 0;
-
-    // Get a list of the CA schemes supported by the plugin.
-    virtual status_t queryPlugins(
-            std::vector<CasPluginDescriptor> *descriptors) const = 0;
-
-    // Construct a new instance of a CasPlugin given a CA_system_id
-    virtual status_t createPlugin(
-            int32_t CA_system_id,
-            uint64_t appData,
-            CasPluginCallback callback,
-            CasPlugin **plugin) = 0;
-
-private:
-    CasFactory(const CasFactory &);
-    CasFactory &operator=(const CasFactory &); /* NOLINT */
-};
-
-struct CasPlugin {
-    CasPlugin() {}
-    virtual ~CasPlugin() {}
-
-    // Provide the CA private data from a CA_descriptor in the conditional
-    // access table to a CasPlugin.
-    virtual status_t setPrivateData(
-            const CasData &privateData) = 0;
-
-    // Open a session for descrambling a program, or one or more elementary
-    // streams.
-    virtual status_t openSession(CasSessionId *sessionId) = 0;
-
-    // Close a previously opened session.
-    virtual status_t closeSession(const CasSessionId &sessionId) = 0;
-
-    // Provide the CA private data from a CA_descriptor in the program map
-    // table to a CasPlugin.
-    virtual status_t setSessionPrivateData(
-            const CasSessionId &sessionId,
-            const CasData &privateData) = 0;
-
-    // Process an ECM from the ECM stream for this session’s elementary stream.
-    virtual status_t processEcm(
-            const CasSessionId &sessionId,
-            const CasEcm &ecm) = 0;
-
-    // Process an in-band EMM from the EMM stream.
-    virtual status_t processEmm(
-            const CasEmm &emm) = 0;
-
-    // Deliver an event to the CasPlugin. The format of the event is specific
-    // to the CA scheme and is opaque to the framework.
-    virtual status_t sendEvent(
-            int32_t event,
-            int32_t arg,
-            const CasData &eventData) = 0;
-
-    // Native implementation of the MediaCas Java API provision method.
-    virtual status_t provision(
-            const String8 &provisionString) = 0;
-
-    // Native implementation of the MediaCas Java API refreshEntitlements method
-    virtual status_t refreshEntitlements(
-            int32_t refreshType,
-            const CasData &refreshData) = 0;
-
-private:
-    CasPlugin(const CasPlugin &);
-    CasPlugin &operator=(const CasPlugin &); /* NOLINT */
-};
-
-extern "C" {
-    extern android::CasFactory *createCasFactory();
-}
-
-} // namespace android
-
-#endif // CAS_API_H_
diff --git a/include/media/cas/DescramblerAPI.h b/include/media/cas/DescramblerAPI.h
deleted file mode 100644
index 0a519525e0..0000000000
--- a/include/media/cas/DescramblerAPI.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DESCRAMBLER_API_H_
-#define DESCRAMBLER_API_H_
-
-#include <media/stagefright/MediaErrors.h>
-#include <media/cas/CasAPI.h>
-
-namespace android {
-
-struct AString;
-struct DescramblerPlugin;
-
-struct DescramblerFactory {
-    DescramblerFactory() {}
-    virtual ~DescramblerFactory() {}
-
-    // Determine if the plugin can handle the CA scheme identified by CA_system_id.
-    virtual bool isSystemIdSupported(
-            int32_t CA_system_id) const = 0;
-
-    // Construct a new instance of a DescramblerPlugin given a CA_system_id
-    virtual status_t createPlugin(
-            int32_t CA_system_id, DescramblerPlugin **plugin) = 0;
-
-private:
-    DescramblerFactory(const DescramblerFactory &);
-    DescramblerFactory &operator=(const DescramblerFactory &);
-};
-
-struct DescramblerPlugin {
-    enum ScramblingControl {
-        kScrambling_Unscrambled = 0,
-        kScrambling_Reserved    = 1,
-        kScrambling_EvenKey     = 2,
-        kScrambling_OddKey      = 3,
-    };
-
-    struct SubSample {
-        uint32_t mNumBytesOfClearData;
-        uint32_t mNumBytesOfEncryptedData;
-    };
-
-    DescramblerPlugin() {}
-    virtual ~DescramblerPlugin() {}
-
-    // If this method returns false, a non-secure decoder will be used to
-    // decode the data after decryption. The decrypt API below will have
-    // to support insecure decryption of the data (secure = false) for
-    // media data of the given mime type.
-    virtual bool requiresSecureDecoderComponent(const char *mime) const = 0;
-
-    // A MediaCas session may be associated with a MediaCrypto session.  The
-    // associated MediaCas session is used to load decryption keys
-    // into the crypto/cas plugin.  The keys are then referenced by key-id
-    // in the 'key' parameter to the decrypt() method.
-    // Should return NO_ERROR on success, ERROR_DRM_SESSION_NOT_OPENED if
-    // the session is not opened and a code from MediaErrors.h otherwise.
-    virtual status_t setMediaCasSession(const CasSessionId& sessionId) = 0;
-
-    // If the error returned falls into the range
-    // ERROR_DRM_VENDOR_MIN..ERROR_DRM_VENDOR_MAX, errorDetailMsg should be
-    // filled in with an appropriate string.
-    // At the java level these special errors will then trigger a
-    // MediaCodec.CryptoException that gives clients access to both
-    // the error code and the errorDetailMsg.
-    // Returns a non-negative result to indicate the number of bytes written
-    // to the dstPtr, or a negative result to indicate an error.
-    virtual ssize_t descramble(
-            bool secure,
-            ScramblingControl scramblingControl,
-            size_t numSubSamples,
-            const SubSample *subSamples,
-            const void *srcPtr,
-            int32_t srcOffset,
-            void *dstPtr,
-            int32_t dstOffset,
-            AString *errorDetailMsg) = 0;
-
-private:
-    DescramblerPlugin(const DescramblerPlugin &);
-    DescramblerPlugin &operator=(const DescramblerPlugin &);
-};
-
-}  // namespace android
-
-extern "C" {
-    extern android::DescramblerFactory *createDescramblerFactory();
-}
-
-#endif  // DESCRAMBLER_API_H_
diff --git a/include/media/drm/DrmAPI.h b/include/media/drm/DrmAPI.h
deleted file mode 100644
index 985d919220..0000000000
--- a/include/media/drm/DrmAPI.h
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DRM_API_H_
-#define DRM_API_H_
-
-#include <utils/List.h>
-#include <utils/String8.h>
-#include <utils/Vector.h>
-#include <utils/KeyedVector.h>
-#include <utils/RefBase.h>
-#include <utils/Mutex.h>
-#include <media/stagefright/foundation/ABase.h>
-
-//  Loadable DrmEngine shared libraries should define the entry points
-//  createDrmFactory and createCryptoFactory as shown below:
-//
-//  extern "C" {
-//      extern android::DrmFactory *createDrmFactory();
-//      extern android::CryptoFactory *createCryptoFactory();
-//  }
-
-namespace android {
-
-    class DrmPlugin;
-    class DrmPluginListener;
-
-    // DRMs are implemented in DrmEngine plugins, which are dynamically
-    // loadable shared libraries that implement the entry points
-    // createDrmFactory and createCryptoFactory.  createDrmFactory
-    // constructs and returns an instance of a DrmFactory object.  Similarly,
-    // createCryptoFactory creates an instance of a CryptoFactory object.
-    // When a MediaCrypto or MediaDrm object needs to be constructed, all
-    // available DrmEngines present in the plugins directory on the device
-    // are scanned for a matching DrmEngine that can support the crypto
-    // scheme.  When a match is found, the DrmEngine's createCryptoPlugin and
-    // createDrmPlugin methods are used to create CryptoPlugin or
-    // DrmPlugin instances to support that DRM scheme.
-
-    class DrmFactory {
-    public:
-        DrmFactory() {}
-        virtual ~DrmFactory() {}
-
-        // DrmFactory::isCryptoSchemeSupported can be called to determine
-        // if the plugin factory is able to construct plugins that support a
-        // given crypto scheme, which is specified by a UUID.
-        virtual bool isCryptoSchemeSupported(const uint8_t uuid[16]) = 0;
-
-        // DrmFactory::isContentTypeSupported can be called to determine
-        // if the plugin factory is able to construct plugins that support a
-        // given media container format specified by mimeType
-        virtual bool isContentTypeSupported(const String8 &mimeType) = 0;
-
-        // Construct a DrmPlugin for the crypto scheme specified by UUID.
-        virtual status_t createDrmPlugin(
-                const uint8_t uuid[16], DrmPlugin **plugin) = 0;
-
-    private:
-        DrmFactory(const DrmFactory &);
-        DrmFactory &operator=(const DrmFactory &);
-    };
-
-    class DrmPlugin {
-    public:
-        enum EventType {
-            kDrmPluginEventProvisionRequired = 1,
-            kDrmPluginEventKeyNeeded,
-            kDrmPluginEventKeyExpired,
-            kDrmPluginEventVendorDefined,
-            kDrmPluginEventSessionReclaimed,
-            kDrmPluginEventExpirationUpdate,
-            kDrmPluginEventKeysChange,
-        };
-
-        // Drm keys can be for offline content or for online streaming.
-        // Offline keys are persisted on the device and may be used when the device
-        // is disconnected from the network.  The Release type is used to request
-        // that offline keys be no longer restricted to offline use.
-        enum KeyType {
-            kKeyType_Offline,
-            kKeyType_Streaming,
-            kKeyType_Release
-        };
-
-        // Enumerate KeyRequestTypes to allow an app to determine the
-        // type of a key request returned from getKeyRequest.
-        enum KeyRequestType {
-            kKeyRequestType_Unknown,
-            kKeyRequestType_Initial,
-            kKeyRequestType_Renewal,
-            kKeyRequestType_Release
-        };
-
-        // Enumerate KeyStatusTypes which indicate the state of a key
-        enum KeyStatusType
-        {
-            kKeyStatusType_Usable,
-            kKeyStatusType_Expired,
-            kKeyStatusType_OutputNotAllowed,
-            kKeyStatusType_StatusPending,
-            kKeyStatusType_InternalError
-        };
-
-        // Used by sendKeysChange to report the usability status of each
-        // key to the app.
-        struct KeyStatus
-        {
-            Vector<uint8_t> mKeyId;
-            KeyStatusType mType;
-        };
-
-        DrmPlugin() {}
-        virtual ~DrmPlugin() {}
-
-        // Open a new session with the DrmPlugin object.  A session ID is returned
-        // in the sessionId parameter.
-        virtual status_t openSession(Vector<uint8_t> &sessionId) = 0;
-
-        // Close a session on the DrmPlugin object.
-        virtual status_t closeSession(Vector<uint8_t> const &sessionId) = 0;
-
-        // A key request/response exchange occurs between the app and a License
-        // Server to obtain the keys required to decrypt the content.  getKeyRequest()
-        // is used to obtain an opaque key request blob that is delivered to the
-        // license server.
-        //
-        // The scope parameter may be a sessionId or a keySetId, depending on the
-        // specified keyType.  When the keyType is kKeyType_Offline or
-        // kKeyType_Streaming, scope should be set to the sessionId the keys will be
-        // provided to.  When the keyType is kKeyType_Release, scope should be set to
-        // the keySetId of the keys being released.  Releasing keys from a device
-        // invalidates them for all sessions.
-        //
-        // The init data passed to getKeyRequest is container-specific and its
-        // meaning is interpreted based on the mime type provided in the mimeType
-        // parameter to getKeyRequest.  It could contain, for example, the content
-        // ID, key ID or other data obtained from the content metadata that is required
-        // in generating the key request.  Init may be null when keyType is
-        // kKeyType_Release.
-        //
-        // mimeType identifies the mime type of the content
-        //
-        // keyType specifies if the keys are to be used for streaming or offline content
-        //
-        // optionalParameters are included in the key request message to allow a
-        // client application to provide additional message parameters to the server.
-        //
-        // If successful, the opaque key request blob is returned to the caller.
-        virtual status_t
-            getKeyRequest(Vector<uint8_t> const &scope,
-                          Vector<uint8_t> const &initData,
-                          String8 const &mimeType, KeyType keyType,
-                          KeyedVector<String8, String8> const &optionalParameters,
-                          Vector<uint8_t> &request, String8 &defaultUrl,
-                          KeyRequestType *keyRequestType) = 0;
-
-        //
-        // After a key response is received by the app, it is provided to the
-        // Drm plugin using provideKeyResponse.
-        //
-        // scope may be a sessionId or a keySetId depending on the type of the
-        // response.  Scope should be set to the sessionId when the response is
-        // for either streaming or offline key requests.  Scope should be set to the
-        // keySetId when the response is for a release request.
-        //
-        // When the response is for an offline key request, a keySetId is returned
-        // in the keySetId vector parameter that can be used to later restore the
-        // keys to a new session with the method restoreKeys. When the response is
-        // for a streaming or release request, no keySetId is returned.
-        //
-        virtual status_t provideKeyResponse(Vector<uint8_t> const &scope,
-                                            Vector<uint8_t> const &response,
-                                            Vector<uint8_t> &keySetId) = 0;
-
-        // Remove the current keys from a session
-        virtual status_t removeKeys(Vector<uint8_t> const &sessionId) = 0;
-
-        // Restore persisted offline keys into a new session.  keySetId identifies
-        // the keys to load, obtained from a prior call to provideKeyResponse().
-        virtual status_t restoreKeys(Vector<uint8_t> const &sessionId,
-                                     Vector<uint8_t> const &keySetId) = 0;
-
-        // Request an informative description of the license for the session.  The status
-        // is in the form of {name, value} pairs.  Since DRM license policies vary by
-        // vendor, the specific status field names are determined by each DRM vendor.
-        // Refer to your DRM provider documentation for definitions of the field names
-        // for a particular DrmEngine.
-        virtual status_t
-            queryKeyStatus(Vector<uint8_t> const &sessionId,
-                           KeyedVector<String8, String8> &infoMap) const = 0;
-
-        // A provision request/response exchange occurs between the app and a
-        // provisioning server to retrieve a device certificate.  getProvisionRequest
-        // is used to obtain an opaque key request blob that is delivered to the
-        // provisioning server.
-        //
-        // If successful, the opaque provision request blob is returned to the caller.
-        virtual status_t getProvisionRequest(String8 const &cert_type,
-                                             String8 const &cert_authority,
-                                             Vector<uint8_t> &request,
-                                             String8 &defaultUrl) = 0;
-
-        // After a provision response is received by the app, it is provided to the
-        // Drm plugin using provideProvisionResponse.
-        virtual status_t provideProvisionResponse(Vector<uint8_t> const &response,
-                                                  Vector<uint8_t> &certificate,
-                                                  Vector<uint8_t> &wrapped_key) = 0;
-
-        // A means of enforcing the contractual requirement for a concurrent stream
-        // limit per subscriber across devices is provided via SecureStop.  SecureStop
-        // is a means of securely monitoring the lifetime of sessions. Since playback
-        // on a device can be interrupted due to reboot, power failure, etc. a means
-        // of persisting the lifetime information on the device is needed.
-        //
-        // A signed version of the sessionID is written to persistent storage on the
-        // device when each MediaCrypto object is created. The sessionID is signed by
-        // the device private key to prevent tampering.
-        //
-        // In the normal case, playback will be completed, the session destroyed and
-        // the Secure Stops will be queried. The App queries secure stops and forwards
-        // the secure stop message to the server which verifies the signature and
-        // notifies the server side database that the session destruction has been
-        // confirmed. The persisted record on the client is only removed after positive
-        // confirmation that the server received the message using releaseSecureStops().
-        virtual status_t getSecureStops(List<Vector<uint8_t> > &secureStops) = 0;
-        virtual status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop) = 0;
-        virtual status_t releaseSecureStops(Vector<uint8_t> const &ssRelease) = 0;
-        virtual status_t releaseAllSecureStops() = 0;
-
-        // Read a property value given the device property string.  There are a few forms
-        // of property access methods, depending on the data type returned.
-        // Since DRM plugin properties may vary, additional field names may be defined
-        // by each DRM vendor.  Refer to your DRM provider documentation for definitions
-        // of its additional field names.
-        //
-        // Standard values are:
-        //   "vendor" [string] identifies the maker of the plugin
-        //   "version" [string] identifies the version of the plugin
-        //   "description" [string] describes the plugin
-        //   'deviceUniqueId' [byte array] The device unique identifier is established
-        //   during device provisioning and provides a means of uniquely identifying
-        //   each device.
-        virtual status_t getPropertyString(String8 const &name, String8 &value ) const = 0;
-        virtual status_t getPropertyByteArray(String8 const &name,
-                                              Vector<uint8_t> &value ) const = 0;
-
-        // Write  a property value given the device property string.  There are a few forms
-        // of property setting methods, depending on the data type.
-        // Since DRM plugin properties may vary, additional field names may be defined
-        // by each DRM vendor.  Refer to your DRM provider documentation for definitions
-        // of its field names.
-        virtual status_t setPropertyString(String8 const &name,
-                                           String8 const &value ) = 0;
-        virtual status_t setPropertyByteArray(String8 const &name,
-                                              Vector<uint8_t> const &value ) = 0;
-
-        // The following methods implement operations on a CryptoSession to support
-        // encrypt, decrypt, sign verify operations on operator-provided
-        // session keys.
-
-        //
-        // The algorithm string conforms to JCA Standard Names for Cipher
-        // Transforms and is case insensitive.  For example "AES/CBC/PKCS5Padding".
-        //
-        // Return OK if the algorithm is supported, otherwise return BAD_VALUE
-        //
-        virtual status_t setCipherAlgorithm(Vector<uint8_t> const &sessionId,
-                                            String8 const &algorithm) = 0;
-
-        //
-        // The algorithm string conforms to JCA Standard Names for Mac
-        // Algorithms and is case insensitive.  For example "HmacSHA256".
-        //
-        // Return OK if the algorithm is supported, otherwise return BAD_VALUE
-        //
-        virtual status_t setMacAlgorithm(Vector<uint8_t> const &sessionId,
-                                         String8 const &algorithm) = 0;
-
-        // Encrypt the provided input buffer with the cipher algorithm
-        // specified by setCipherAlgorithm and the key selected by keyId,
-        // and return the encrypted data.
-        virtual status_t encrypt(Vector<uint8_t> const &sessionId,
-                                 Vector<uint8_t> const &keyId,
-                                 Vector<uint8_t> const &input,
-                                 Vector<uint8_t> const &iv,
-                                 Vector<uint8_t> &output) = 0;
-
-        // Decrypt the provided input buffer with the cipher algorithm
-        // specified by setCipherAlgorithm and the key selected by keyId,
-        // and return the decrypted data.
-        virtual status_t decrypt(Vector<uint8_t> const &sessionId,
-                                 Vector<uint8_t> const &keyId,
-                                 Vector<uint8_t> const &input,
-                                 Vector<uint8_t> const &iv,
-                                 Vector<uint8_t> &output) = 0;
-
-        // Compute a signature on the provided message using the mac algorithm
-        // specified by setMacAlgorithm and the key selected by keyId,
-        // and return the signature.
-        virtual status_t sign(Vector<uint8_t> const &sessionId,
-                              Vector<uint8_t> const &keyId,
-                              Vector<uint8_t> const &message,
-                              Vector<uint8_t> &signature) = 0;
-
-        // Compute a signature on the provided message using the mac algorithm
-        // specified by setMacAlgorithm and the key selected by keyId,
-        // and compare with the expected result.  Set result to true or
-        // false depending on the outcome.
-        virtual status_t verify(Vector<uint8_t> const &sessionId,
-                                Vector<uint8_t> const &keyId,
-                                Vector<uint8_t> const &message,
-                                Vector<uint8_t> const &signature,
-                                bool &match) = 0;
-
-
-        // Compute an RSA signature on the provided message using the algorithm
-        // specified by algorithm.
-        virtual status_t signRSA(Vector<uint8_t> const &sessionId,
-                                 String8 const &algorithm,
-                                 Vector<uint8_t> const &message,
-                                 Vector<uint8_t> const &wrapped_key,
-                                 Vector<uint8_t> &signature) = 0;
-
-
-        status_t setListener(const sp<DrmPluginListener>& listener) {
-            Mutex::Autolock lock(mEventLock);
-            mListener = listener;
-            return OK;
-        }
-
-    protected:
-        // Plugins call these methods to deliver events to the java app
-        void sendEvent(EventType eventType, int extra,
-                       Vector<uint8_t> const *sessionId,
-                       Vector<uint8_t> const *data);
-
-        void sendExpirationUpdate(Vector<uint8_t> const *sessionId,
-                                  int64_t expiryTimeInMS);
-
-        void sendKeysChange(Vector<uint8_t> const *sessionId,
-                            Vector<DrmPlugin::KeyStatus> const *keyStatusList,
-                            bool hasNewUsableKey);
-
-    private:
-        Mutex mEventLock;
-        sp<DrmPluginListener> mListener;
-
-        DISALLOW_EVIL_CONSTRUCTORS(DrmPlugin);
-    };
-
-    class DrmPluginListener: virtual public RefBase
-    {
-    public:
-        virtual void sendEvent(DrmPlugin::EventType eventType, int extra,
-                               Vector<uint8_t> const *sessionId,
-                               Vector<uint8_t> const *data) = 0;
-
-        virtual void sendExpirationUpdate(Vector<uint8_t> const *sessionId,
-                                          int64_t expiryTimeInMS) = 0;
-
-        virtual void sendKeysChange(Vector<uint8_t> const *sessionId,
-                                    Vector<DrmPlugin::KeyStatus> const *keyStatusList,
-                                    bool hasNewUsableKey) = 0;
-    };
-
-    inline void DrmPlugin::sendEvent(EventType eventType, int extra,
-                                     Vector<uint8_t> const *sessionId,
-                                     Vector<uint8_t> const *data) {
-        mEventLock.lock();
-        sp<DrmPluginListener> listener = mListener;
-        mEventLock.unlock();
-
-        if (listener != NULL) {
-            listener->sendEvent(eventType, extra, sessionId, data);
-        }
-    }
-
-    inline void DrmPlugin::sendExpirationUpdate(Vector<uint8_t> const *sessionId,
-                                                int64_t expiryTimeInMS) {
-        mEventLock.lock();
-        sp<DrmPluginListener> listener = mListener;
-        mEventLock.unlock();
-
-        if (listener != NULL) {
-            listener->sendExpirationUpdate(sessionId, expiryTimeInMS);
-        }
-    }
-
-    inline void DrmPlugin::sendKeysChange(Vector<uint8_t> const *sessionId,
-                                          Vector<DrmPlugin::KeyStatus> const *keyStatusList,
-                                          bool hasNewUsableKey) {
-        mEventLock.lock();
-        sp<DrmPluginListener> listener = mListener;
-        mEventLock.unlock();
-
-        if (listener != NULL) {
-            listener->sendKeysChange(sessionId, keyStatusList, hasNewUsableKey);
-        }
-    }
-}  // namespace android
-
-#endif // DRM_API_H_
diff --git a/include/media/editor/II420ColorConverter.h b/include/media/editor/II420ColorConverter.h
deleted file mode 100644
index 33af61ff9a..0000000000
--- a/include/media/editor/II420ColorConverter.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef II420_COLOR_CONVERTER_H
-
-#define II420_COLOR_CONVERTER_H
-
-#include <stdint.h>
-#include <android/rect.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct II420ColorConverter {
-
-    /*
-     * getDecoderOutputFormat
-     * Returns the color format (OMX_COLOR_FORMATTYPE) of the decoder output.
-     * If it is I420 (OMX_COLOR_FormatYUV420Planar), no conversion is needed,
-     * and convertDecoderOutputToI420() can be a no-op.
-     */
-    int (*getDecoderOutputFormat)();
-
-    /*
-     * convertDecoderOutputToI420
-     * @Desc     Converts from the decoder output format to I420 format.
-     * @note     Caller (e.g. VideoEditor) owns the buffers
-     * @param    decoderBits   (IN) Pointer to the buffer contains decoder output
-     * @param    decoderWidth  (IN) Buffer width, as reported by the decoder
-     *                              metadata (kKeyWidth)
-     * @param    decoderHeight (IN) Buffer height, as reported by the decoder
-     *                              metadata (kKeyHeight)
-     * @param    decoderRect   (IN) The rectangle of the actual frame, as
-     *                              reported by decoder metadata (kKeyCropRect)
-     * @param    dstBits      (OUT) Pointer to the output I420 buffer
-     * @return   -1 Any error
-     * @return   0  No Error
-     */
-    int (*convertDecoderOutputToI420)(
-        void* decoderBits, int decoderWidth, int decoderHeight,
-        ARect decoderRect, void* dstBits);
-
-    /*
-     * getEncoderIntputFormat
-     * Returns the color format (OMX_COLOR_FORMATTYPE) of the encoder input.
-     * If it is I420 (OMX_COLOR_FormatYUV420Planar), no conversion is needed,
-     * and convertI420ToEncoderInput() and getEncoderInputBufferInfo() can
-     * be no-ops.
-     */
-    int (*getEncoderInputFormat)();
-
-    /* convertI420ToEncoderInput
-     * @Desc     This function converts from I420 to the encoder input format
-     * @note     Caller (e.g. VideoEditor) owns the buffers
-     * @param    srcBits       (IN) Pointer to the input I420 buffer
-     * @param    srcWidth      (IN) Width of the I420 frame
-     * @param    srcHeight     (IN) Height of the I420 frame
-     * @param    encoderWidth  (IN) Encoder buffer width, as calculated by
-     *                              getEncoderBufferInfo()
-     * @param    encoderHeight (IN) Encoder buffer height, as calculated by
-     *                              getEncoderBufferInfo()
-     * @param    encoderRect   (IN) Rect coordinates of the actual frame inside
-     *                              the encoder buffer, as calculated by
-     *                              getEncoderBufferInfo().
-     * @param    encoderBits  (OUT) Pointer to the output buffer. The size of
-     *                              this buffer is calculated by
-     *                              getEncoderBufferInfo()
-     * @return   -1 Any error
-     * @return   0  No Error
-     */
-    int (*convertI420ToEncoderInput)(
-        void* srcBits, int srcWidth, int srcHeight,
-        int encoderWidth, int encoderHeight, ARect encoderRect,
-        void* encoderBits);
-
-    /* getEncoderInputBufferInfo
-     * @Desc     This function returns metadata for the encoder input buffer
-     *           based on the actual I420 frame width and height.
-     * @note     This API should be be used to obtain the necessary information
-     *           before calling convertI420ToEncoderInput().
-     *           VideoEditor knows only the width and height of the I420 buffer,
-     *           but it also needs know the width, height, and size of the
-     *           encoder input buffer. The encoder input buffer width and height
-     *           are used to set the metadata for the encoder.
-     * @param    srcWidth      (IN) Width of the I420 frame
-     * @param    srcHeight     (IN) Height of the I420 frame
-     * @param    encoderWidth  (OUT) Encoder buffer width needed
-     * @param    encoderHeight (OUT) Encoder buffer height needed
-     * @param    encoderRect   (OUT) Rect coordinates of the actual frame inside
-     *                               the encoder buffer
-     * @param    encoderBufferSize  (OUT) The size of the buffer that need to be
-     *                              allocated by the caller before invoking
-     *                              convertI420ToEncoderInput().
-     * @return   -1 Any error
-     * @return   0  No Error
-     */
-    int (*getEncoderInputBufferInfo)(
-        int srcWidth, int srcHeight,
-        int* encoderWidth, int* encoderHeight,
-        ARect* encoderRect, int* encoderBufferSize);
-
-} II420ColorConverter;
-
-/* The only function that the shared library needs to expose: It fills the
-   function pointers in II420ColorConverter */
-void getI420ColorConverter(II420ColorConverter *converter);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif  // II420_COLOR_CONVERTER_H
diff --git a/include/media/hardware/CryptoAPI.h b/include/media/hardware/CryptoAPI.h
deleted file mode 100644
index 0e86aacc6f..0000000000
--- a/include/media/hardware/CryptoAPI.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <media/stagefright/MediaErrors.h>
-#include <utils/Errors.h>
-#include <utils/Vector.h>
-
-#ifndef CRYPTO_API_H_
-
-#define CRYPTO_API_H_
-
-namespace android {
-
-struct AString;
-struct CryptoPlugin;
-
-struct CryptoFactory {
-    CryptoFactory() {}
-    virtual ~CryptoFactory() {}
-
-    virtual bool isCryptoSchemeSupported(const uint8_t uuid[16]) const = 0;
-
-    virtual status_t createPlugin(
-            const uint8_t uuid[16], const void *data, size_t size,
-            CryptoPlugin **plugin) = 0;
-
-private:
-    CryptoFactory(const CryptoFactory &);
-    CryptoFactory &operator=(const CryptoFactory &);
-};
-
-struct CryptoPlugin {
-    enum Mode {
-        kMode_Unencrypted = 0,
-        kMode_AES_CTR     = 1,
-        kMode_AES_WV      = 2,
-        kMode_AES_CBC     = 3,
-    };
-
-    struct SubSample {
-        uint32_t mNumBytesOfClearData;
-        uint32_t mNumBytesOfEncryptedData;
-    };
-
-    struct Pattern {
-        // Number of blocks to be encrypted in the pattern. If zero, pattern
-        // encryption is inoperative.
-        uint32_t mEncryptBlocks;
-
-        // Number of blocks to be skipped (left clear) in the pattern. If zero,
-        // pattern encryption is inoperative.
-        uint32_t mSkipBlocks;
-    };
-
-    CryptoPlugin() {}
-    virtual ~CryptoPlugin() {}
-
-    // If this method returns false, a non-secure decoder will be used to
-    // decode the data after decryption. The decrypt API below will have
-    // to support insecure decryption of the data (secure = false) for
-    // media data of the given mime type.
-    virtual bool requiresSecureDecoderComponent(const char *mime) const = 0;
-
-    // To implement resolution constraints, the crypto plugin needs to know
-    // the resolution of the video being decrypted.  The media player should
-    // call this method when the resolution is determined and any time it
-    // is subsequently changed.
-
-    virtual void notifyResolution(uint32_t /* width */, uint32_t /* height */) {}
-
-    // A MediaDrm session may be associated with a MediaCrypto session.  The
-    // associated MediaDrm session is used to load decryption keys
-    // into the crypto/drm plugin.  The keys are then referenced by key-id
-    // in the 'key' parameter to the decrypt() method.
-    // Should return NO_ERROR on success, ERROR_DRM_SESSION_NOT_OPENED if
-    // the session is not opened and a code from MediaErrors.h otherwise.
-    virtual status_t setMediaDrmSession(const Vector<uint8_t> & /*sessionId */) {
-        return ERROR_UNSUPPORTED;
-    }
-
-    // If the error returned falls into the range
-    // ERROR_DRM_VENDOR_MIN..ERROR_DRM_VENDOR_MAX, errorDetailMsg should be
-    // filled in with an appropriate string.
-    // At the java level these special errors will then trigger a
-    // MediaCodec.CryptoException that gives clients access to both
-    // the error code and the errorDetailMsg.
-    // Returns a non-negative result to indicate the number of bytes written
-    // to the dstPtr, or a negative result to indicate an error.
-    virtual ssize_t decrypt(
-            bool secure,
-            const uint8_t key[16],
-            const uint8_t iv[16],
-            Mode mode,
-            const Pattern &pattern,
-            const void *srcPtr,
-            const SubSample *subSamples, size_t numSubSamples,
-            void *dstPtr,
-            AString *errorDetailMsg) = 0;
-
-private:
-    CryptoPlugin(const CryptoPlugin &);
-    CryptoPlugin &operator=(const CryptoPlugin &);
-};
-
-}  // namespace android
-
-extern "C" {
-    extern android::CryptoFactory *createCryptoFactory();
-}
-
-#endif  // CRYPTO_API_H_
diff --git a/include/media/hardware/HDCPAPI.h b/include/media/hardware/HDCPAPI.h
deleted file mode 100644
index 7797bb2ab4..0000000000
--- a/include/media/hardware/HDCPAPI.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef HDCP_API_H_
-#define HDCP_API_H_
-
-#include <utils/Errors.h>
-#include <cutils/native_handle.h>
-
-namespace android {
-
-// Two different kinds of modules are covered under the same HDCPModule
-// structure below, a module either implements decryption or encryption.
-struct HDCPModule {
-    typedef void (*ObserverFunc)(void *cookie, int msg, int ext1, int ext2);
-
-    // The msg argument in calls to the observer notification function.
-    enum {
-        // Sent in response to a call to "HDCPModule::initAsync" once
-        // initialization has either been successfully completed,
-        // i.e. the HDCP session is now fully setup (AKE, Locality Check,
-        // SKE and any authentication with repeaters completed) or failed.
-        // ext1 should be a suitable error code (status_t), ext2 is
-        // unused for ENCRYPTION and in the case of HDCP_INITIALIZATION_COMPLETE
-        // holds the local TCP port the module is listening on.
-        HDCP_INITIALIZATION_COMPLETE,
-        HDCP_INITIALIZATION_FAILED,
-
-        // Sent upon completion of a call to "HDCPModule::shutdownAsync".
-        // ext1 should be a suitable error code, ext2 is unused.
-        HDCP_SHUTDOWN_COMPLETE,
-        HDCP_SHUTDOWN_FAILED,
-
-        HDCP_UNAUTHENTICATED_CONNECTION,
-        HDCP_UNAUTHORIZED_CONNECTION,
-        HDCP_REVOKED_CONNECTION,
-        HDCP_TOPOLOGY_EXECEEDED,
-        HDCP_UNKNOWN_ERROR,
-
-        // DECRYPTION only: Indicates that a client has successfully connected,
-        // a secure session established and the module is ready to accept
-        // future calls to "decrypt".
-        HDCP_SESSION_ESTABLISHED,
-    };
-
-    // HDCPModule capability bit masks
-    enum {
-        // HDCP_CAPS_ENCRYPT: mandatory, meaning the HDCP module can encrypt
-        // from an input byte-array buffer to an output byte-array buffer
-        HDCP_CAPS_ENCRYPT = (1 << 0),
-        // HDCP_CAPS_ENCRYPT_NATIVE: the HDCP module supports encryption from
-        // a native buffer to an output byte-array buffer. The format of the
-        // input native buffer is specific to vendor's encoder implementation.
-        // It is the same format as that used by the encoder when
-        // "storeMetaDataInBuffers" extension is enabled on its output port.
-        HDCP_CAPS_ENCRYPT_NATIVE = (1 << 1),
-    };
-
-    // Module can call the notification function to signal completion/failure
-    // of asynchronous operations (such as initialization) or out of band
-    // events.
-    HDCPModule(void * /*cookie*/, ObserverFunc /*observerNotify*/) {};
-
-    virtual ~HDCPModule() {};
-
-    // ENCRYPTION: Request to setup an HDCP session with the host specified
-    // by addr and listening on the specified port.
-    // DECRYPTION: Request to setup an HDCP session, addr is the interface
-    // address the module should bind its socket to. port will be 0.
-    // The module will pick the port to listen on itself and report its choice
-    // in the "ext2" argument of the HDCP_INITIALIZATION_COMPLETE callback.
-    virtual status_t initAsync(const char *addr, unsigned port) = 0;
-
-    // Request to shutdown the active HDCP session.
-    virtual status_t shutdownAsync() = 0;
-
-    // Returns the capability bitmask of this HDCP session.
-    virtual uint32_t getCaps() {
-        return HDCP_CAPS_ENCRYPT;
-    }
-
-    // ENCRYPTION only:
-    // Encrypt data according to the HDCP spec. "size" bytes of data are
-    // available at "inData" (virtual address), "size" may not be a multiple
-    // of 128 bits (16 bytes). An equal number of encrypted bytes should be
-    // written to the buffer at "outData" (virtual address).
-    // This operation is to be synchronous, i.e. this call does not return
-    // until outData contains size bytes of encrypted data.
-    // streamCTR will be assigned by the caller (to 0 for the first PES stream,
-    // 1 for the second and so on)
-    // inputCTR _will_be_maintained_by_the_callee_ for each PES stream.
-    virtual status_t encrypt(
-            const void * /*inData*/, size_t /*size*/, uint32_t /*streamCTR*/,
-            uint64_t * /*outInputCTR*/, void * /*outData*/) {
-        return INVALID_OPERATION;
-    }
-
-    // Encrypt data according to the HDCP spec. "size" bytes of data starting
-    // at location "offset" are available in "buffer" (buffer handle). "size"
-    // may not be a multiple of 128 bits (16 bytes). An equal number of
-    // encrypted bytes should be written to the buffer at "outData" (virtual
-    // address). This operation is to be synchronous, i.e. this call does not
-    // return until outData contains size bytes of encrypted data.
-    // streamCTR will be assigned by the caller (to 0 for the first PES stream,
-    // 1 for the second and so on)
-    // inputCTR _will_be_maintained_by_the_callee_ for each PES stream.
-    virtual status_t encryptNative(
-            buffer_handle_t /*buffer*/, size_t /*offset*/, size_t /*size*/,
-            uint32_t /*streamCTR*/, uint64_t * /*outInputCTR*/, void * /*outData*/) {
-        return INVALID_OPERATION;
-    }
-    // DECRYPTION only:
-    // Decrypt data according to the HDCP spec.
-    // "size" bytes of encrypted data are available at "inData"
-    // (virtual address), "size" may not be a multiple of 128 bits (16 bytes).
-    // An equal number of decrypted bytes should be written to the buffer
-    // at "outData" (virtual address).
-    // This operation is to be synchronous, i.e. this call does not return
-    // until outData contains size bytes of decrypted data.
-    // Both streamCTR and inputCTR will be provided by the caller.
-    virtual status_t decrypt(
-            const void * /*inData*/, size_t /*size*/,
-            uint32_t /*streamCTR*/, uint64_t /*inputCTR*/,
-            void * /*outData*/) {
-        return INVALID_OPERATION;
-    }
-
-private:
-    HDCPModule(const HDCPModule &);
-    HDCPModule &operator=(const HDCPModule &);
-};
-
-}  // namespace android
-
-// A shared library exporting the following methods should be included to
-// support HDCP functionality. The shared library must be called
-// "libstagefright_hdcp.so", it will be dynamically loaded into the
-// mediaserver process.
-extern "C" {
-    // Create a module for ENCRYPTION.
-    extern android::HDCPModule *createHDCPModule(
-            void *cookie, android::HDCPModule::ObserverFunc);
-
-    // Create a module for DECRYPTION.
-    extern android::HDCPModule *createHDCPModuleForDecryption(
-            void *cookie, android::HDCPModule::ObserverFunc);
-}
-
-#endif  // HDCP_API_H_
-
diff --git a/include/media/hardware/HardwareAPI.h b/include/media/hardware/HardwareAPI.h
deleted file mode 100644
index 6c1ba3de00..0000000000
--- a/include/media/hardware/HardwareAPI.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef HARDWARE_API_H_
-
-#define HARDWARE_API_H_
-
-#include <media/hardware/OMXPluginBase.h>
-#include <media/hardware/MetadataBufferType.h>
-#include <cutils/native_handle.h>
-#include <utils/RefBase.h>
-
-#include "VideoAPI.h"
-
-#include <OMX_Component.h>
-
-struct ANativeWindowBuffer;
-
-namespace android {
-
-// This structure is used to enable Android native buffer use for either
-// graphic buffers or secure buffers.
-//
-// TO CONTROL ANDROID GRAPHIC BUFFER USAGE:
-//
-// A pointer to this struct is passed to the OMX_SetParameter when the extension
-// index for the 'OMX.google.android.index.enableAndroidNativeBuffers' extension
-// is given.
-//
-// When Android native buffer use is disabled for a port (the default state),
-// the OMX node should operate as normal, and expect UseBuffer calls to set its
-// buffers.  This is the mode that will be used when CPU access to the buffer is
-// required.
-//
-// When Android native buffer use has been enabled for a given port, the video
-// color format for the port is to be interpreted as an Android pixel format
-// rather than an OMX color format.  Enabling Android native buffers may also
-// change how the component receives the native buffers.  If store-metadata-mode
-// is enabled on the port, the component will receive the buffers as specified
-// in the section below. Otherwise, unless the node supports the
-// 'OMX.google.android.index.useAndroidNativeBuffer2' extension, it should
-// expect to receive UseAndroidNativeBuffer calls (via OMX_SetParameter) rather
-// than UseBuffer calls for that port.
-//
-// TO CONTROL ANDROID SECURE BUFFER USAGE:
-//
-// A pointer to this struct is passed to the OMX_SetParameter when the extension
-// index for the 'OMX.google.android.index.allocateNativeHandle' extension
-// is given.
-//
-// When native handle use is disabled for a port (the default state),
-// the OMX node should operate as normal, and expect AllocateBuffer calls to
-// return buffer pointers. This is the mode that will be used for non-secure
-// buffers if component requires allocate buffers instead of use buffers.
-//
-// When native handle use has been enabled for a given port, the component
-// shall allocate native_buffer_t objects containing  that can be passed between
-// processes using binder. This is the mode that will be used for secure buffers.
-// When an OMX component allocates native handle for buffers, it must close and
-// delete that handle when it frees those buffers. Even though pBuffer will point
-// to a native handle, nFilledLength, nAllocLength and nOffset will correspond
-// to the data inside the opaque buffer.
-struct EnableAndroidNativeBuffersParams {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL enable;
-};
-
-typedef struct EnableAndroidNativeBuffersParams AllocateNativeHandleParams;
-
-// A pointer to this struct is passed to OMX_SetParameter() when the extension index
-// "OMX.google.android.index.storeMetaDataInBuffers" or
-// "OMX.google.android.index.storeANWBufferInMetadata" is given.
-//
-// When meta data is stored in the video buffers passed between OMX clients
-// and OMX components, interpretation of the buffer data is up to the
-// buffer receiver, and the data may or may not be the actual video data, but
-// some information helpful for the receiver to locate the actual data.
-// The buffer receiver thus needs to know how to interpret what is stored
-// in these buffers, with mechanisms pre-determined externally. How to
-// interpret the meta data is outside of the scope of this parameter.
-//
-// Currently, this is used to pass meta data from video source (camera component, for instance) to
-// video encoder to avoid memcpying of input video frame data, as well as to pass dynamic output
-// buffer to video decoder. To do this, bStoreMetaData is set to OMX_TRUE.
-//
-// If bStoreMetaData is set to false, real YUV frame data will be stored in input buffers, and
-// the output buffers contain either real YUV frame data, or are themselves native handles as
-// directed by enable/use-android-native-buffer parameter settings.
-// In addition, if no OMX_SetParameter() call is made on a port with the corresponding extension
-// index, the component should not assume that the client is not using metadata mode for the port.
-//
-// If the component supports this using the "OMX.google.android.index.storeANWBufferInMetadata"
-// extension and bStoreMetaData is set to OMX_TRUE, data is passed using the VideoNativeMetadata
-// layout as defined below. Each buffer will be accompanied by a fence. The fence must signal
-// before the buffer can be used (e.g. read from or written into). When returning such buffer to
-// the client, component must provide a new fence that must signal before the returned buffer can
-// be used (e.g. read from or written into). The component owns the incoming fenceFd, and must close
-// it when fence has signaled. The client will own and close the returned fence file descriptor.
-//
-// If the component supports this using the "OMX.google.android.index.storeMetaDataInBuffers"
-// extension and bStoreMetaData is set to OMX_TRUE, data is passed using VideoGrallocMetadata
-// (the layout of which is the VideoGrallocMetadata defined below). Camera input can be also passed
-// as "CameraSource", the layout of which is vendor dependent.
-//
-// Metadata buffers are registered with the component using UseBuffer calls, or can be allocated
-// by the component for encoder-metadata-output buffers.
-struct StoreMetaDataInBuffersParams {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bStoreMetaData;
-};
-
-// Meta data buffer layout used to transport output frames to the decoder for
-// dynamic buffer handling.
-struct VideoGrallocMetadata {
-    MetadataBufferType eType;               // must be kMetadataBufferTypeGrallocSource
-#ifdef OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
-    OMX_PTR pHandle;
-#else
-    buffer_handle_t pHandle;
-#endif
-};
-
-// Legacy name for VideoGrallocMetadata struct.
-struct VideoDecoderOutputMetaData : public VideoGrallocMetadata {};
-
-struct VideoNativeMetadata {
-    MetadataBufferType eType;               // must be kMetadataBufferTypeANWBuffer
-#ifdef OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
-    OMX_PTR pBuffer;
-#else
-    struct ANativeWindowBuffer* pBuffer;
-#endif
-    int nFenceFd;                           // -1 if unused
-};
-
-// Meta data buffer layout for passing a native_handle to codec
-struct VideoNativeHandleMetadata {
-    MetadataBufferType eType;               // must be kMetadataBufferTypeNativeHandleSource
-
-#ifdef OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
-    OMX_PTR pHandle;
-#else
-    native_handle_t *pHandle;
-#endif
-};
-
-// A pointer to this struct is passed to OMX_SetParameter() when the extension
-// index "OMX.google.android.index.prepareForAdaptivePlayback" is given.
-//
-// This method is used to signal a video decoder, that the user has requested
-// seamless resolution change support (if bEnable is set to OMX_TRUE).
-// nMaxFrameWidth and nMaxFrameHeight are the dimensions of the largest
-// anticipated frames in the video.  If bEnable is OMX_FALSE, no resolution
-// change is expected, and the nMaxFrameWidth/Height fields are unused.
-//
-// If the decoder supports dynamic output buffers, it may ignore this
-// request.  Otherwise, it shall request resources in such a way so that it
-// avoids full port-reconfiguration (due to output port-definition change)
-// during resolution changes.
-//
-// DO NOT USE THIS STRUCTURE AS IT WILL BE REMOVED.  INSTEAD, IMPLEMENT
-// METADATA SUPPORT FOR VIDEO DECODERS.
-struct PrepareForAdaptivePlaybackParams {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bEnable;
-    OMX_U32 nMaxFrameWidth;
-    OMX_U32 nMaxFrameHeight;
-};
-
-// A pointer to this struct is passed to OMX_SetParameter when the extension
-// index for the 'OMX.google.android.index.useAndroidNativeBuffer' extension is
-// given.  This call will only be performed if a prior call was made with the
-// 'OMX.google.android.index.enableAndroidNativeBuffers' extension index,
-// enabling use of Android native buffers.
-struct UseAndroidNativeBufferParams {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_PTR pAppPrivate;
-    OMX_BUFFERHEADERTYPE **bufferHeader;
-    const sp<ANativeWindowBuffer>& nativeBuffer;
-};
-
-// A pointer to this struct is passed to OMX_GetParameter when the extension
-// index for the 'OMX.google.android.index.getAndroidNativeBufferUsage'
-// extension is given.  The usage bits returned from this query will be used to
-// allocate the Gralloc buffers that get passed to the useAndroidNativeBuffer
-// command.
-struct GetAndroidNativeBufferUsageParams {
-    OMX_U32 nSize;              // IN
-    OMX_VERSIONTYPE nVersion;   // IN
-    OMX_U32 nPortIndex;         // IN
-    OMX_U32 nUsage;             // OUT
-};
-
-// An enum OMX_COLOR_FormatAndroidOpaque to indicate an opaque colorformat
-// is declared in media/stagefright/openmax/OMX_IVCommon.h
-// This will inform the encoder that the actual
-// colorformat will be relayed by the GRalloc Buffers.
-// OMX_COLOR_FormatAndroidOpaque  = 0x7F000001,
-
-// A pointer to this struct is passed to OMX_SetParameter when the extension
-// index for the 'OMX.google.android.index.prependSPSPPSToIDRFrames' extension
-// is given.
-// A successful result indicates that future IDR frames will be prefixed by
-// SPS/PPS.
-struct PrependSPSPPSToIDRFramesParams {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bEnable;
-};
-
-// A pointer to this struct is passed to OMX_GetParameter when the extension
-// index for the 'OMX.google.android.index.describeColorFormat'
-// extension is given.  This method can be called from any component state
-// other than invalid.  The color-format, frame width/height, and stride/
-// slice-height parameters are ones that are associated with a raw video
-// port (input or output), but the stride/slice height parameters may be
-// incorrect. bUsingNativeBuffers is OMX_TRUE if native android buffers will
-// be used (while specifying this color format).
-//
-// The component shall fill out the MediaImage structure that
-// corresponds to the described raw video format, and the potentially corrected
-// stride and slice-height info.
-//
-// The behavior is slightly different if bUsingNativeBuffers is OMX_TRUE,
-// though most implementations can ignore this difference. When using native buffers,
-// the component may change the configured color format to an optimized format.
-// Additionally, when allocating these buffers for flexible usecase, the framework
-// will set the SW_READ/WRITE_OFTEN usage flags. In this case (if bUsingNativeBuffers
-// is OMX_TRUE), the component shall fill out the MediaImage information for the
-// scenario when these SW-readable/writable buffers are locked using gralloc_lock.
-// Note, that these buffers may also be locked using gralloc_lock_ycbcr, which must
-// be supported for vendor-specific formats.
-//
-// For non-YUV packed planar/semiplanar image formats, or if bUsingNativeBuffers
-// is OMX_TRUE and the component does not support this color format with native
-// buffers, the component shall set mNumPlanes to 0, and mType to MEDIA_IMAGE_TYPE_UNKNOWN.
-
-// @deprecated: use DescribeColorFormat2Params
-struct DescribeColorFormat2Params;
-struct DescribeColorFormatParams {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    // input: parameters from OMX_VIDEO_PORTDEFINITIONTYPE
-    OMX_COLOR_FORMATTYPE eColorFormat;
-    OMX_U32 nFrameWidth;
-    OMX_U32 nFrameHeight;
-    OMX_U32 nStride;
-    OMX_U32 nSliceHeight;
-    OMX_BOOL bUsingNativeBuffers;
-
-    // output: fill out the MediaImage fields
-    MediaImage sMediaImage;
-
-    explicit DescribeColorFormatParams(const DescribeColorFormat2Params&); // for internal use only
-};
-
-// A pointer to this struct is passed to OMX_GetParameter when the extension
-// index for the 'OMX.google.android.index.describeColorFormat2'
-// extension is given. This is operationally the same as DescribeColorFormatParams
-// but can be used for HDR and RGBA/YUVA formats.
-struct DescribeColorFormat2Params {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    // input: parameters from OMX_VIDEO_PORTDEFINITIONTYPE
-    OMX_COLOR_FORMATTYPE eColorFormat;
-    OMX_U32 nFrameWidth;
-    OMX_U32 nFrameHeight;
-    OMX_U32 nStride;
-    OMX_U32 nSliceHeight;
-    OMX_BOOL bUsingNativeBuffers;
-
-    // output: fill out the MediaImage2 fields
-    MediaImage2 sMediaImage;
-
-    void initFromV1(const DescribeColorFormatParams&); // for internal use only
-};
-
-// A pointer to this struct is passed to OMX_SetParameter or OMX_GetParameter
-// when the extension index for the
-// 'OMX.google.android.index.configureVideoTunnelMode' extension is  given.
-// If the extension is supported then tunneled playback mode should be supported
-// by the codec. If bTunneled is set to OMX_TRUE then the video decoder should
-// operate in "tunneled" mode and output its decoded frames directly to the
-// sink. In this case nAudioHwSync is the HW SYNC ID of the audio HAL Output
-// stream to sync the video with. If bTunneled is set to OMX_FALSE, "tunneled"
-// mode should be disabled and nAudioHwSync should be ignored.
-// OMX_GetParameter is used to query tunneling configuration. bTunneled should
-// return whether decoder is operating in tunneled mode, and if it is,
-// pSidebandWindow should contain the codec allocated sideband window handle.
-struct ConfigureVideoTunnelModeParams {
-    OMX_U32 nSize;              // IN
-    OMX_VERSIONTYPE nVersion;   // IN
-    OMX_U32 nPortIndex;         // IN
-    OMX_BOOL bTunneled;         // IN/OUT
-    OMX_U32 nAudioHwSync;       // IN
-    OMX_PTR pSidebandWindow;    // OUT
-};
-
-// Color space description (aspects) parameters.
-// This is passed via OMX_SetConfig or OMX_GetConfig to video encoders and decoders when the
-// 'OMX.google.android.index.describeColorAspects' extension is given. Component SHALL behave
-// as described below if it supports this extension.
-//
-// bDataSpaceChanged and bRequestingDataSpace is assumed to be OMX_FALSE unless noted otherwise.
-//
-// VIDEO ENCODERS: the framework uses OMX_SetConfig to specify color aspects of the coded video.
-// This may happen:
-//   a) before the component transitions to idle state
-//   b) before the input frame is sent via OMX_EmptyThisBuffer in executing state
-//   c) during execution, just before an input frame with a different color aspect information
-//      is sent.
-//
-// The framework also uses OMX_GetConfig to
-//   d) verify the color aspects that will be written to the stream
-//   e) (optional) verify the color aspects that should be reported to the container for a
-//      given dataspace/pixelformat received
-//
-// 1. Encoders SHOULD maintain an internal color aspect state, initialized to Unspecified values.
-//    This represents the values that will be written into the bitstream.
-// 2. Upon OMX_SetConfig, they SHOULD update their internal state to the aspects received
-//    (including Unspecified values). For specific aspect values that are not supported by the
-//    codec standard, encoders SHOULD substitute Unspecified values; or they MAY use a suitable
-//    alternative (e.g. to suggest the use of BT.709 EOTF instead of SMPTE 240M.)
-// 3. OMX_GetConfig SHALL return the internal state (values that will be written).
-// 4. OMX_SetConfig SHALL always succeed before receiving the first frame. It MAY fail afterwards,
-//    but only if the configured values would change AND the component does not support updating the
-//    color information to those values mid-stream. If component supports updating a portion of
-//    the color information, those values should be updated in the internal state, and OMX_SetConfig
-//    SHALL succeed. Otherwise, the internal state SHALL remain intact and OMX_SetConfig SHALL fail
-//    with OMX_ErrorUnsupportedSettings.
-// 5. When the framework receives an input frame with an unexpected dataspace, it will query
-//    encoders for the color aspects that should be reported to the container using OMX_GetConfig
-//    with bDataSpaceChanged set to OMX_TRUE, and nPixelFormat/nDataSpace containing the new
-//    format/dataspace values. This allows vendors to use extended dataspace during capture and
-//    composition (e.g. screenrecord) - while performing color-space conversion inside the encoder -
-//    and encode and report a different color-space information in the bitstream/container.
-//    sColorAspects contains the requested color aspects by the client for reference, which may
-//    include aspects not supported by the encoding. This is used together with guidance for
-//    dataspace selection; see 6. below.
-//
-// VIDEO DECODERS: the framework uses OMX_SetConfig to specify the default color aspects to use
-// for the video.
-// This may happen:
-//   a) before the component transitions to idle state
-//   b) during execution, when the resolution or the default color aspects change.
-//
-// The framework also uses OMX_GetConfig to
-//   c) get the final color aspects reported by the coded bitstream after taking the default values
-//      into account.
-//
-// 1. Decoders should maintain two color aspect states - the default state as reported by the
-//    framework, and the coded state as reported by the bitstream - as each state can change
-//    independently from the other.
-// 2. Upon OMX_SetConfig, it SHALL update its default state regardless of whether such aspects
-//    could be supplied by the component bitstream. (E.g. it should blindly support all enumeration
-//    values, even unknown ones, and the Other value). This SHALL always succeed.
-// 3. Upon OMX_GetConfig, the component SHALL return the final color aspects by replacing
-//    Unspecified coded values with the default values. This SHALL always succeed.
-// 4. Whenever the component processes color aspect information in the bitstream even with an
-//    Unspecified value, it SHOULD update its internal coded state with that information just before
-//    the frame with the new information would be outputted, and the component SHALL signal an
-//    OMX_EventPortSettingsChanged event with data2 set to the extension index.
-// NOTE: Component SHOULD NOT signal a separate event purely for color aspect change, if it occurs
-//    together with a port definition (e.g. size) or crop change.
-// 5. If the aspects a component encounters in the bitstream cannot be represented with enumeration
-//    values as defined below, the component SHALL set those aspects to Other. Restricted values in
-//    the bitstream SHALL be treated as defined by the relevant bitstream specifications/standards,
-//    or as Unspecified, if not defined.
-//
-// BOTH DECODERS AND ENCODERS: the framework uses OMX_GetConfig during idle and executing state to
-//   f) (optional) get guidance for the dataspace to set for given color aspects, by setting
-//      bRequestingDataSpace to OMX_TRUE. The component SHALL return OMX_ErrorUnsupportedSettings
-//      IF it does not support this request.
-//
-// 6. This is an information request that can happen at any time, independent of the normal
-//    configuration process. This allows vendors to use extended dataspace during capture, playback
-//    and composition - while performing color-space conversion inside the component. Component
-//    SHALL set the desired dataspace into nDataSpace. Otherwise, it SHALL return
-//    OMX_ErrorUnsupportedSettings to let the framework choose a nearby standard dataspace.
-//
-// 6.a. For encoders, this query happens before the first frame is received using surface encoding.
-//    This allows the encoder to use a specific dataspace for the color aspects (e.g. because the
-//    device supports additional dataspaces, or because it wants to perform color-space extension
-//    to facilitate a more optimal rendering/capture pipeline.).
-//
-// 6.b. For decoders, this query happens before the first frame, and every time the color aspects
-//    change, while using surface buffers. This allows the decoder to use a specific dataspace for
-//    the color aspects (e.g. because the device supports additional dataspaces, or because it wants
-//    to perform color-space extension by inline color-space conversion to facilitate a more optimal
-//    rendering pipeline.).
-//
-// Note: the size of sAspects may increase in the future by additional fields.
-// Implementations SHOULD NOT require a certain size.
-struct DescribeColorAspectsParams {
-    OMX_U32 nSize;                 // IN
-    OMX_VERSIONTYPE nVersion;      // IN
-    OMX_U32 nPortIndex;            // IN
-    OMX_BOOL bRequestingDataSpace; // IN
-    OMX_BOOL bDataSpaceChanged;    // IN
-    OMX_U32 nPixelFormat;          // IN
-    OMX_U32 nDataSpace;            // OUT
-    ColorAspects sAspects;         // IN/OUT
-};
-
-// HDR color description parameters.
-// This is passed via OMX_SetConfig or OMX_GetConfig to video encoders and decoders when the
-// 'OMX.google.android.index.describeHDRColorInfo' extension is given and an HDR stream
-// is detected.  Component SHALL behave as described below if it supports this extension.
-//
-// Currently, only Static Metadata Descriptor Type 1 support is required.
-//
-// VIDEO ENCODERS: the framework uses OMX_SetConfig to specify the HDR static information of the
-// coded video.
-// This may happen:
-//   a) before the component transitions to idle state
-//   b) before the input frame is sent via OMX_EmptyThisBuffer in executing state
-//   c) during execution, just before an input frame with a different HDR static
-//      information is sent.
-//
-// The framework also uses OMX_GetConfig to
-//   d) verify the HDR static information that will be written to the stream.
-//
-// 1. Encoders SHOULD maintain an internal HDR static info data, initialized to Unspecified values.
-//    This represents the values that will be written into the bitstream.
-// 2. Upon OMX_SetConfig, they SHOULD update their internal state to the info received
-//    (including Unspecified values). For specific parameters that are not supported by the
-//    codec standard, encoders SHOULD substitute Unspecified values. NOTE: no other substitution
-//    is allowed.
-// 3. OMX_GetConfig SHALL return the internal state (values that will be written).
-// 4. OMX_SetConfig SHALL always succeed before receiving the first frame if the encoder is
-//    configured into an HDR compatible profile. It MAY fail with OMX_ErrorUnsupportedSettings error
-//    code if it is not configured into such a profile, OR if the configured values would change
-//    AND the component does not support updating the HDR static information mid-stream. If the
-//    component supports updating a portion of the information, those values should be updated in
-//    the internal state, and OMX_SetConfig SHALL succeed. Otherwise, the internal state SHALL
-//    remain intact.
-//
-// VIDEO DECODERS: the framework uses OMX_SetConfig to specify the default HDR static information
-// to use for the video.
-//   a) This only happens if the client supplies this information, in which case it occurs before
-//      the component transitions to idle state.
-//   b) This may also happen subsequently if the default HDR static information changes.
-//
-// The framework also uses OMX_GetConfig to
-//   c) get the final HDR static information reported by the coded bitstream after taking the
-//      default values into account.
-//
-// 1. Decoders should maintain two HDR static information structures - the default values as
-//    reported by the framework, and the coded values as reported by the bitstream - as each
-//    structure can change independently from the other.
-// 2. Upon OMX_SetConfig, it SHALL update its default structure regardless of whether such static
-//    parameters could be supplied by the component bitstream. (E.g. it should blindly support all
-//    parameter values, even seemingly illegal ones). This SHALL always succeed.
-//  Note: The descriptor ID used in sInfo may change in subsequent calls. (although for now only
-//    Type 1 support is required.)
-// 3. Upon OMX_GetConfig, the component SHALL return the final HDR static information by replacing
-//    Unspecified coded values with the default values. This SHALL always succeed. This may be
-//    provided using any supported descriptor ID (currently only Type 1) with the goal of expressing
-//    the most of the available static information.
-// 4. Whenever the component processes HDR static information in the bitstream even ones with
-//    Unspecified parameters, it SHOULD update its internal coded structure with that information
-//    just before the frame with the new information would be outputted, and the component SHALL
-//    signal an OMX_EventPortSettingsChanged event with data2 set to the extension index.
-// NOTE: Component SHOULD NOT signal a separate event purely for HDR static info change, if it
-//    occurs together with a port definition (e.g. size), color aspect or crop change.
-// 5. If certain parameters of the HDR static information encountered in the bitstream cannot be
-//    represented using sInfo, the component SHALL use the closest representation.
-//
-// Note: the size of sInfo may increase in the future by supporting additional descriptor types.
-// Implementations SHOULD NOT require a certain size.
-struct DescribeHDRStaticInfoParams {
-    OMX_U32 nSize;                 // IN
-    OMX_VERSIONTYPE nVersion;      // IN
-    OMX_U32 nPortIndex;            // IN
-    HDRStaticInfo sInfo;           // IN/OUT
-};
-
-}  // namespace android
-
-extern android::OMXPluginBase *createOMXPlugin();
-
-#endif  // HARDWARE_API_H_
diff --git a/include/media/hardware/MetadataBufferType.h b/include/media/hardware/MetadataBufferType.h
deleted file mode 100644
index 4f6d5e2f26..0000000000
--- a/include/media/hardware/MetadataBufferType.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef METADATA_BUFFER_TYPE_H
-#define METADATA_BUFFER_TYPE_H
-
-#ifdef __cplusplus
-extern "C" {
-namespace android {
-#endif
-
-/*
- * MetadataBufferType defines the type of the metadata buffers that
- * can be passed to video encoder component for encoding, via Stagefright
- * media recording framework. To see how to work with the metadata buffers
- * in media recording framework, please consult HardwareAPI.h
- *
- * The creator of metadata buffers and video encoder share common knowledge
- * on what is actually being stored in these metadata buffers, and
- * how the information can be used by the video encoder component
- * to locate the actual pixel data as the source input for video
- * encoder, plus whatever other information that is necessary. Stagefright
- * media recording framework does not need to know anything specific about the
- * metadata buffers, except for receving each individual metadata buffer
- * as the source input, making a copy of the metadata buffer, and passing the
- * copy via OpenMAX API to the video encoder component.
- *
- * The creator of the metadata buffers must ensure that the first
- * 4 bytes in every metadata buffer indicates its buffer type,
- * and the rest of the metadata buffer contains the
- * actual metadata information. When a video encoder component receives
- * a metadata buffer, it uses the first 4 bytes in that buffer to find
- * out the type of the metadata buffer, and takes action appropriate
- * to that type of metadata buffers (for instance, locate the actual
- * pixel data input and then encoding the input data to produce a
- * compressed output buffer).
- *
- * The following shows the layout of a metadata buffer,
- * where buffer type is a 4-byte field of MetadataBufferType,
- * and the payload is the metadata information.
- *
- * --------------------------------------------------------------
- * |  buffer type  |          payload                           |
- * --------------------------------------------------------------
- *
- */
-typedef enum {
-
-    /*
-     * kMetadataBufferTypeCameraSource is used to indicate that
-     * the source of the metadata buffer is the camera component.
-     */
-    kMetadataBufferTypeCameraSource  = 0,
-
-    /*
-     * kMetadataBufferTypeGrallocSource is used to indicate that
-     * the payload of the metadata buffers can be interpreted as
-     * a buffer_handle_t.
-     * So in this case,the metadata that the encoder receives
-     * will have a byte stream that consists of two parts:
-     * 1. First, there is an integer indicating that it is a GRAlloc
-     * source (kMetadataBufferTypeGrallocSource)
-     * 2. This is followed by the buffer_handle_t that is a handle to the
-     * GRalloc buffer. The encoder needs to interpret this GRalloc handle
-     * and encode the frames.
-     * --------------------------------------------------------------
-     * |  kMetadataBufferTypeGrallocSource | buffer_handle_t buffer |
-     * --------------------------------------------------------------
-     *
-     * See the VideoGrallocMetadata structure.
-     */
-    kMetadataBufferTypeGrallocSource = 1,
-
-    /*
-     * kMetadataBufferTypeGraphicBuffer is used to indicate that
-     * the payload of the metadata buffers can be interpreted as
-     * an ANativeWindowBuffer, and that a fence is provided.
-     *
-     * In this case, the metadata will have a byte stream that consists of three parts:
-     * 1. First, there is an integer indicating that the metadata
-     * contains an ANativeWindowBuffer (kMetadataBufferTypeANWBuffer)
-     * 2. This is followed by the pointer to the ANativeWindowBuffer.
-     * Codec must not free this buffer as it does not actually own this buffer.
-     * 3. Finally, there is an integer containing a fence file descriptor.
-     * The codec must wait on the fence before encoding or decoding into this
-     * buffer. When the buffer is returned, codec must replace this file descriptor
-     * with a new fence, that will be waited on before the buffer is replaced
-     * (encoder) or read (decoder).
-     * ---------------------------------
-     * |  kMetadataBufferTypeANWBuffer |
-     * ---------------------------------
-     * |  ANativeWindowBuffer *buffer  |
-     * ---------------------------------
-     * |  int fenceFd                  |
-     * ---------------------------------
-     *
-     * See the VideoNativeMetadata structure.
-     */
-    kMetadataBufferTypeANWBuffer = 2,
-
-    /*
-     * kMetadataBufferTypeNativeHandleSource is used to indicate that
-     * the payload of the metadata buffers can be interpreted as
-     * a native_handle_t.
-     *
-     * In this case, the metadata that the encoder receives
-     * will have a byte stream that consists of two parts:
-     * 1. First, there is an integer indicating that the metadata contains a
-     * native handle (kMetadataBufferTypeNativeHandleSource).
-     * 2. This is followed by a pointer to native_handle_t. The encoder needs
-     * to interpret this native handle and encode the frame. The encoder must
-     * not free this native handle as it does not actually own this native
-     * handle. The handle will be freed after the encoder releases the buffer
-     * back to camera.
-     * ----------------------------------------------------------------
-     * |  kMetadataBufferTypeNativeHandleSource | native_handle_t* nh |
-     * ----------------------------------------------------------------
-     *
-     * See the VideoNativeHandleMetadata structure.
-     */
-    kMetadataBufferTypeNativeHandleSource = 3,
-
-    /* This value is used by framework, but is never used inside a metadata buffer  */
-    kMetadataBufferTypeInvalid = -1,
-
-
-    // Add more here...
-
-} MetadataBufferType;
-
-#ifdef __cplusplus
-}  // namespace android
-}
-#endif
-
-#endif  // METADATA_BUFFER_TYPE_H
diff --git a/include/media/hardware/OMXPluginBase.h b/include/media/hardware/OMXPluginBase.h
deleted file mode 100644
index 7bf414739b..0000000000
--- a/include/media/hardware/OMXPluginBase.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef OMX_PLUGIN_BASE_H_
-
-#define OMX_PLUGIN_BASE_H_
-
-#include <sys/types.h>
-
-#include <OMX_Component.h>
-
-#include <utils/String8.h>
-#include <utils/Vector.h>
-
-namespace android {
-
-struct OMXPluginBase {
-    OMXPluginBase() {}
-    virtual ~OMXPluginBase() {}
-
-    virtual OMX_ERRORTYPE makeComponentInstance(
-            const char *name,
-            const OMX_CALLBACKTYPE *callbacks,
-            OMX_PTR appData,
-            OMX_COMPONENTTYPE **component) = 0;
-
-    virtual OMX_ERRORTYPE destroyComponentInstance(
-            OMX_COMPONENTTYPE *component) = 0;
-
-    virtual OMX_ERRORTYPE enumerateComponents(
-            OMX_STRING name,
-            size_t size,
-            OMX_U32 index) = 0;
-
-    virtual OMX_ERRORTYPE getRolesOfComponent(
-            const char *name,
-            Vector<String8> *roles) = 0;
-
-private:
-    OMXPluginBase(const OMXPluginBase &);
-    OMXPluginBase &operator=(const OMXPluginBase &);
-};
-
-}  // namespace android
-
-#endif  // OMX_PLUGIN_BASE_H_
diff --git a/include/media/hardware/VideoAPI.h b/include/media/hardware/VideoAPI.h
deleted file mode 100644
index a09087698c..0000000000
--- a/include/media/hardware/VideoAPI.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef VIDEO_API_H_
-
-#define VIDEO_API_H_
-
-namespace android {
-
-/**
- * Structure describing a media image (frame)
- * Currently only supporting YUV
- * @deprecated. Use MediaImage2 instead
- */
-struct MediaImage {
-    enum Type {
-        MEDIA_IMAGE_TYPE_UNKNOWN = 0,
-        MEDIA_IMAGE_TYPE_YUV,
-    };
-
-    enum PlaneIndex {
-        Y = 0,
-        U,
-        V,
-        MAX_NUM_PLANES
-    };
-
-    Type mType;
-    uint32_t mNumPlanes;              // number of planes
-    uint32_t mWidth;                  // width of largest plane (unpadded, as in nFrameWidth)
-    uint32_t mHeight;                 // height of largest plane (unpadded, as in nFrameHeight)
-    uint32_t mBitDepth;               // useable bit depth
-    struct PlaneInfo {
-        uint32_t mOffset;             // offset of first pixel of the plane in bytes
-                                      // from buffer offset
-        uint32_t mColInc;             // column increment in bytes
-        uint32_t mRowInc;             // row increment in bytes
-        uint32_t mHorizSubsampling;   // subsampling compared to the largest plane
-        uint32_t mVertSubsampling;    // subsampling compared to the largest plane
-    };
-    PlaneInfo mPlane[MAX_NUM_PLANES];
-};
-
-/**
- * Structure describing a media image (frame)
- */
-struct __attribute__ ((__packed__)) MediaImage2 {
-    enum Type : uint32_t {
-        MEDIA_IMAGE_TYPE_UNKNOWN = 0,
-        MEDIA_IMAGE_TYPE_YUV,
-        MEDIA_IMAGE_TYPE_YUVA,
-        MEDIA_IMAGE_TYPE_RGB,
-        MEDIA_IMAGE_TYPE_RGBA,
-        MEDIA_IMAGE_TYPE_Y,
-    };
-
-    enum PlaneIndex : uint32_t {
-        Y = 0,
-        U = 1,
-        V = 2,
-        R = 0,
-        G = 1,
-        B = 2,
-        A = 3,
-        MAX_NUM_PLANES = 4,
-    };
-
-    Type mType;
-    uint32_t mNumPlanes;              // number of planes
-    uint32_t mWidth;                  // width of largest plane (unpadded, as in nFrameWidth)
-    uint32_t mHeight;                 // height of largest plane (unpadded, as in nFrameHeight)
-    uint32_t mBitDepth;               // useable bit depth (always MSB)
-    uint32_t mBitDepthAllocated;      // bits per component (must be 8 or 16)
-
-    struct __attribute__ ((__packed__)) PlaneInfo {
-        uint32_t mOffset;             // offset of first pixel of the plane in bytes
-                                      // from buffer offset
-        int32_t mColInc;              // column increment in bytes
-        int32_t mRowInc;              // row increment in bytes
-        uint32_t mHorizSubsampling;   // subsampling compared to the largest plane
-        uint32_t mVertSubsampling;    // subsampling compared to the largest plane
-    };
-    PlaneInfo mPlane[MAX_NUM_PLANES];
-
-    void initFromV1(const MediaImage&); // for internal use only
-};
-
-static_assert(sizeof(MediaImage2::PlaneInfo) == 20, "wrong struct size");
-static_assert(sizeof(MediaImage2) == 104, "wrong struct size");
-
-/**
- * Aspects of color.
- */
-
-// NOTE: this structure is expected to grow in the future if new color aspects are
-// added to codec bitstreams. OMX component should not require a specific nSize
-// though could verify that nSize is at least the size of the structure at the
-// time of implementation. All new fields will be added at the end of the structure
-// ensuring backward compatibility.
-struct __attribute__ ((__packed__, aligned(alignof(uint32_t)))) ColorAspects {
-    // this is in sync with the range values in graphics.h
-    enum Range : uint32_t {
-        RangeUnspecified,
-        RangeFull,
-        RangeLimited,
-        RangeOther = 0xff,
-    };
-
-    enum Primaries : uint32_t {
-        PrimariesUnspecified,
-        PrimariesBT709_5,       // Rec.ITU-R BT.709-5 or equivalent
-        PrimariesBT470_6M,      // Rec.ITU-R BT.470-6 System M or equivalent
-        PrimariesBT601_6_625,   // Rec.ITU-R BT.601-6 625 or equivalent
-        PrimariesBT601_6_525,   // Rec.ITU-R BT.601-6 525 or equivalent
-        PrimariesGenericFilm,   // Generic Film
-        PrimariesBT2020,        // Rec.ITU-R BT.2020 or equivalent
-        PrimariesOther = 0xff,
-    };
-
-    // this partially in sync with the transfer values in graphics.h prior to the transfers
-    // unlikely to be required by Android section
-    enum Transfer : uint32_t {
-        TransferUnspecified,
-        TransferLinear,         // Linear transfer characteristics
-        TransferSRGB,           // sRGB or equivalent
-        TransferSMPTE170M,      // SMPTE 170M or equivalent (e.g. BT.601/709/2020)
-        TransferGamma22,        // Assumed display gamma 2.2
-        TransferGamma28,        // Assumed display gamma 2.8
-        TransferST2084,         // SMPTE ST 2084 for 10/12/14/16 bit systems
-        TransferHLG,            // ARIB STD-B67 hybrid-log-gamma
-
-        // transfers unlikely to be required by Android
-        TransferSMPTE240M = 0x40, // SMPTE 240M
-        TransferXvYCC,          // IEC 61966-2-4
-        TransferBT1361,         // Rec.ITU-R BT.1361 extended gamut
-        TransferST428,          // SMPTE ST 428-1
-        TransferOther = 0xff,
-    };
-
-    enum MatrixCoeffs : uint32_t {
-        MatrixUnspecified,
-        MatrixBT709_5,          // Rec.ITU-R BT.709-5 or equivalent
-        MatrixBT470_6M,         // KR=0.30, KB=0.11 or equivalent
-        MatrixBT601_6,          // Rec.ITU-R BT.601-6 625 or equivalent
-        MatrixSMPTE240M,        // SMPTE 240M or equivalent
-        MatrixBT2020,           // Rec.ITU-R BT.2020 non-constant luminance
-        MatrixBT2020Constant,   // Rec.ITU-R BT.2020 constant luminance
-        MatrixOther = 0xff,
-    };
-
-    // this is in sync with the standard values in graphics.h
-    enum Standard : uint32_t {
-        StandardUnspecified,
-        StandardBT709,                  // PrimariesBT709_5 and MatrixBT709_5
-        StandardBT601_625,              // PrimariesBT601_6_625 and MatrixBT601_6
-        StandardBT601_625_Unadjusted,   // PrimariesBT601_6_625 and KR=0.222, KB=0.071
-        StandardBT601_525,              // PrimariesBT601_6_525 and MatrixBT601_6
-        StandardBT601_525_Unadjusted,   // PrimariesBT601_6_525 and MatrixSMPTE240M
-        StandardBT2020,                 // PrimariesBT2020 and MatrixBT2020
-        StandardBT2020Constant,         // PrimariesBT2020 and MatrixBT2020Constant
-        StandardBT470M,                 // PrimariesBT470_6M and MatrixBT470_6M
-        StandardFilm,                   // PrimariesGenericFilm and KR=0.253, KB=0.068
-        StandardOther = 0xff,
-    };
-
-    Range mRange;                // IN/OUT
-    Primaries mPrimaries;        // IN/OUT
-    Transfer mTransfer;          // IN/OUT
-    MatrixCoeffs mMatrixCoeffs;  // IN/OUT
-};
-
-static_assert(sizeof(ColorAspects) == 16, "wrong struct size");
-
-/**
- * HDR Metadata.
- */
-
-// HDR Static Metadata Descriptor as defined by CTA-861-3.
-struct __attribute__ ((__packed__)) HDRStaticInfo {
-    // Static_Metadata_Descriptor_ID
-    enum ID : uint8_t {
-        kType1 = 0, // Static Metadata Type 1
-    } mID;
-
-    struct __attribute__ ((__packed__)) Primaries1 {
-        // values are in units of 0.00002
-        uint16_t x;
-        uint16_t y;
-    };
-
-    // Static Metadata Descriptor Type 1
-    struct __attribute__ ((__packed__)) Type1 {
-        Primaries1 mR; // display primary 0
-        Primaries1 mG; // display primary 1
-        Primaries1 mB; // display primary 2
-        Primaries1 mW; // white point
-        uint16_t mMaxDisplayLuminance; // in cd/m^2
-        uint16_t mMinDisplayLuminance; // in 0.0001 cd/m^2
-        uint16_t mMaxContentLightLevel; // in cd/m^2
-        uint16_t mMaxFrameAverageLightLevel; // in cd/m^2
-    };
-
-    union {
-         Type1 sType1;
-    };
-};
-
-static_assert(sizeof(HDRStaticInfo::Primaries1) == 4, "wrong struct size");
-static_assert(sizeof(HDRStaticInfo::Type1) == 24, "wrong struct size");
-static_assert(sizeof(HDRStaticInfo) == 25, "wrong struct size");
-
-#ifdef STRINGIFY_ENUMS
-
-inline static const char *asString(MediaImage::Type i, const char *def = "??") {
-    switch (i) {
-        case MediaImage::MEDIA_IMAGE_TYPE_UNKNOWN: return "Unknown";
-        case MediaImage::MEDIA_IMAGE_TYPE_YUV:     return "YUV";
-        default:                                   return def;
-    }
-}
-
-inline static const char *asString(MediaImage::PlaneIndex i, const char *def = "??") {
-    switch (i) {
-        case MediaImage::Y: return "Y";
-        case MediaImage::U: return "U";
-        case MediaImage::V: return "V";
-        default:            return def;
-    }
-}
-
-inline static const char *asString(MediaImage2::Type i, const char *def = "??") {
-    switch (i) {
-        case MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN: return "Unknown";
-        case MediaImage2::MEDIA_IMAGE_TYPE_YUV:     return "YUV";
-        case MediaImage2::MEDIA_IMAGE_TYPE_YUVA:    return "YUVA";
-        case MediaImage2::MEDIA_IMAGE_TYPE_RGB:     return "RGB";
-        case MediaImage2::MEDIA_IMAGE_TYPE_RGBA:    return "RGBA";
-        case MediaImage2::MEDIA_IMAGE_TYPE_Y:       return "Y";
-        default:                                    return def;
-    }
-}
-
-inline static char asChar2(
-        MediaImage2::PlaneIndex i, MediaImage2::Type j, char def = '?') {
-    const char *planes = asString(j, NULL);
-    // handle unknown values
-    if (j == MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN || planes == NULL || i >= strlen(planes)) {
-        return def;
-    }
-    return planes[i];
-}
-
-inline static const char *asString(ColorAspects::Range i, const char *def = "??") {
-    switch (i) {
-        case ColorAspects::RangeUnspecified: return "Unspecified";
-        case ColorAspects::RangeFull:        return "Full";
-        case ColorAspects::RangeLimited:     return "Limited";
-        case ColorAspects::RangeOther:       return "Other";
-        default:                             return def;
-    }
-}
-
-inline static const char *asString(ColorAspects::Primaries i, const char *def = "??") {
-    switch (i) {
-        case ColorAspects::PrimariesUnspecified: return "Unspecified";
-        case ColorAspects::PrimariesBT709_5:     return "BT709_5";
-        case ColorAspects::PrimariesBT470_6M:    return "BT470_6M";
-        case ColorAspects::PrimariesBT601_6_625: return "BT601_6_625";
-        case ColorAspects::PrimariesBT601_6_525: return "BT601_6_525";
-        case ColorAspects::PrimariesGenericFilm: return "GenericFilm";
-        case ColorAspects::PrimariesBT2020:      return "BT2020";
-        case ColorAspects::PrimariesOther:       return "Other";
-        default:                                 return def;
-    }
-}
-
-inline static const char *asString(ColorAspects::Transfer i, const char *def = "??") {
-    switch (i) {
-        case ColorAspects::TransferUnspecified: return "Unspecified";
-        case ColorAspects::TransferLinear:      return "Linear";
-        case ColorAspects::TransferSRGB:        return "SRGB";
-        case ColorAspects::TransferSMPTE170M:   return "SMPTE170M";
-        case ColorAspects::TransferGamma22:     return "Gamma22";
-        case ColorAspects::TransferGamma28:     return "Gamma28";
-        case ColorAspects::TransferST2084:      return "ST2084";
-        case ColorAspects::TransferHLG:         return "HLG";
-        case ColorAspects::TransferSMPTE240M:   return "SMPTE240M";
-        case ColorAspects::TransferXvYCC:       return "XvYCC";
-        case ColorAspects::TransferBT1361:      return "BT1361";
-        case ColorAspects::TransferST428:       return "ST428";
-        case ColorAspects::TransferOther:       return "Other";
-        default:                                return def;
-    }
-}
-
-inline static const char *asString(ColorAspects::MatrixCoeffs i, const char *def = "??") {
-    switch (i) {
-        case ColorAspects::MatrixUnspecified:    return "Unspecified";
-        case ColorAspects::MatrixBT709_5:        return "BT709_5";
-        case ColorAspects::MatrixBT470_6M:       return "BT470_6M";
-        case ColorAspects::MatrixBT601_6:        return "BT601_6";
-        case ColorAspects::MatrixSMPTE240M:      return "SMPTE240M";
-        case ColorAspects::MatrixBT2020:         return "BT2020";
-        case ColorAspects::MatrixBT2020Constant: return "BT2020Constant";
-        case ColorAspects::MatrixOther:          return "Other";
-        default:                                 return def;
-    }
-}
-
-inline static const char *asString(ColorAspects::Standard i, const char *def = "??") {
-    switch (i) {
-        case ColorAspects::StandardUnspecified:          return "Unspecified";
-        case ColorAspects::StandardBT709:                return "BT709";
-        case ColorAspects::StandardBT601_625:            return "BT601_625";
-        case ColorAspects::StandardBT601_625_Unadjusted: return "BT601_625_Unadjusted";
-        case ColorAspects::StandardBT601_525:            return "BT601_525";
-        case ColorAspects::StandardBT601_525_Unadjusted: return "BT601_525_Unadjusted";
-        case ColorAspects::StandardBT2020:               return "BT2020";
-        case ColorAspects::StandardBT2020Constant:       return "BT2020Constant";
-        case ColorAspects::StandardBT470M:               return "BT470M";
-        case ColorAspects::StandardFilm:                 return "Film";
-        case ColorAspects::StandardOther:                return "Other";
-        default:                                         return def;
-    }
-}
-
-#endif
-
-}  // namespace android
-
-#endif  // VIDEO_API_H_
diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h
deleted file mode 100644
index 56d7cc81ce..0000000000
--- a/include/media/openmax/OMX_AsString.h
+++ /dev/null
@@ -1,1052 +0,0 @@
-/*
- * Copyright 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* NOTE: This file contains several sections for individual OMX include files.
-   Each section has its own include guard.  This file should be included AFTER
-   the OMX include files. */
-
-#ifdef ANDROID
-namespace android {
-#endif
-
-#ifdef OMX_Audio_h
-/* asString definitions if media/openmax/OMX_Audio.h was included */
-
-#ifndef AS_STRING_FOR_OMX_AUDIO_H
-#define AS_STRING_FOR_OMX_AUDIO_H
-
-inline static const char *asString(OMX_AUDIO_CODINGTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_CodingUnused:     return "Unused";      // unused
-        case OMX_AUDIO_CodingAutoDetect: return "AutoDetect";  // unused
-        case OMX_AUDIO_CodingPCM:        return "PCM";
-        case OMX_AUDIO_CodingADPCM:      return "ADPCM";       // unused
-        case OMX_AUDIO_CodingAMR:        return "AMR";
-        case OMX_AUDIO_CodingGSMFR:      return "GSMFR";
-        case OMX_AUDIO_CodingGSMEFR:     return "GSMEFR";      // unused
-        case OMX_AUDIO_CodingGSMHR:      return "GSMHR";       // unused
-        case OMX_AUDIO_CodingPDCFR:      return "PDCFR";       // unused
-        case OMX_AUDIO_CodingPDCEFR:     return "PDCEFR";      // unused
-        case OMX_AUDIO_CodingPDCHR:      return "PDCHR";       // unused
-        case OMX_AUDIO_CodingTDMAFR:     return "TDMAFR";      // unused
-        case OMX_AUDIO_CodingTDMAEFR:    return "TDMAEFR";     // unused
-        case OMX_AUDIO_CodingQCELP8:     return "QCELP8";      // unused
-        case OMX_AUDIO_CodingQCELP13:    return "QCELP13";     // unused
-        case OMX_AUDIO_CodingEVRC:       return "EVRC";        // unused
-        case OMX_AUDIO_CodingSMV:        return "SMV";         // unused
-        case OMX_AUDIO_CodingG711:       return "G711";
-        case OMX_AUDIO_CodingG723:       return "G723";        // unused
-        case OMX_AUDIO_CodingG726:       return "G726";        // unused
-        case OMX_AUDIO_CodingG729:       return "G729";        // unused
-        case OMX_AUDIO_CodingAAC:        return "AAC";
-        case OMX_AUDIO_CodingMP3:        return "MP3";
-        case OMX_AUDIO_CodingSBC:        return "SBC";         // unused
-        case OMX_AUDIO_CodingVORBIS:     return "VORBIS";
-        case OMX_AUDIO_CodingWMA:        return "WMA";         // unused
-        case OMX_AUDIO_CodingRA:         return "RA";          // unused
-        case OMX_AUDIO_CodingMIDI:       return "MIDI";        // unused
-        case OMX_AUDIO_CodingFLAC:       return "FLAC";
-        default:                         return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_PCMMODETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_PCMModeLinear: return "Linear";
-        case OMX_AUDIO_PCMModeALaw:   return "ALaw";
-        case OMX_AUDIO_PCMModeMULaw:  return "MULaw";
-        default:                      return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_CHANNELTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_ChannelNone: return "None";  // unused
-        case OMX_AUDIO_ChannelLF:   return "LF";
-        case OMX_AUDIO_ChannelRF:   return "RF";
-        case OMX_AUDIO_ChannelCF:   return "CF";
-        case OMX_AUDIO_ChannelLS:   return "LS";
-        case OMX_AUDIO_ChannelRS:   return "RS";
-        case OMX_AUDIO_ChannelLFE:  return "LFE";
-        case OMX_AUDIO_ChannelCS:   return "CS";
-        case OMX_AUDIO_ChannelLR:   return "LR";
-        case OMX_AUDIO_ChannelRR:   return "RR";
-        default:                    return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_CHANNELMODETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_ChannelModeStereo:      return "Stereo";
-//      case OMX_AUDIO_ChannelModeJointStereo: return "JointStereo";
-//      case OMX_AUDIO_ChannelModeDual:        return "Dual";
-        case OMX_AUDIO_ChannelModeMono:        return "Mono";
-        default:                               return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_AACPROFILETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_AACObjectNull:     return "Null";
-        case OMX_AUDIO_AACObjectMain:     return "Main";
-        case OMX_AUDIO_AACObjectLC:       return "LC";
-        case OMX_AUDIO_AACObjectSSR:      return "SSR";
-        case OMX_AUDIO_AACObjectLTP:      return "LTP";
-        case OMX_AUDIO_AACObjectHE:       return "HE";
-        case OMX_AUDIO_AACObjectScalable: return "Scalable";
-        case OMX_AUDIO_AACObjectER_Scalable: return "ER_Scalable";
-        case OMX_AUDIO_AACObjectERLC:     return "ERLC";
-        case OMX_AUDIO_AACObjectLD:       return "LD";
-        case OMX_AUDIO_AACObjectHE_PS:    return "HE_PS";
-        default:                          return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_AACSTREAMFORMATTYPE i, const char *def = "??") {
-    switch (i) {
-//      case OMX_AUDIO_AACStreamFormatMP2ADTS: return "MP2ADTS";
-        case OMX_AUDIO_AACStreamFormatMP4ADTS: return "MP4ADTS";
-//      case OMX_AUDIO_AACStreamFormatMP4LOAS: return "MP4LOAS";
-//      case OMX_AUDIO_AACStreamFormatMP4LATM: return "MP4LATM";
-//      case OMX_AUDIO_AACStreamFormatADIF:    return "ADIF";
-        case OMX_AUDIO_AACStreamFormatMP4FF:   return "MP4FF";
-//      case OMX_AUDIO_AACStreamFormatRAW:     return "RAW";
-        default:                               return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_AMRFRAMEFORMATTYPE i, const char *def = "??") {
-    switch (i) {
-//      case OMX_AUDIO_AMRFrameFormatConformance: return "Conformance";
-//      case OMX_AUDIO_AMRFrameFormatIF1:         return "IF1";
-//      case OMX_AUDIO_AMRFrameFormatIF2:         return "IF2";
-        case OMX_AUDIO_AMRFrameFormatFSF:         return "FSF";
-//      case OMX_AUDIO_AMRFrameFormatRTPPayload:  return "RTPPayload";
-//      case OMX_AUDIO_AMRFrameFormatITU:         return "ITU";
-        default:                                  return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_AMRBANDMODETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_AMRBandModeUnused: return "Unused";
-        case OMX_AUDIO_AMRBandModeNB0:    return "NB0";
-        case OMX_AUDIO_AMRBandModeNB1:    return "NB1";
-        case OMX_AUDIO_AMRBandModeNB2:    return "NB2";
-        case OMX_AUDIO_AMRBandModeNB3:    return "NB3";
-        case OMX_AUDIO_AMRBandModeNB4:    return "NB4";
-        case OMX_AUDIO_AMRBandModeNB5:    return "NB5";
-        case OMX_AUDIO_AMRBandModeNB6:    return "NB6";
-        case OMX_AUDIO_AMRBandModeNB7:    return "NB7";
-        case OMX_AUDIO_AMRBandModeWB0:    return "WB0";
-        case OMX_AUDIO_AMRBandModeWB1:    return "WB1";
-        case OMX_AUDIO_AMRBandModeWB2:    return "WB2";
-        case OMX_AUDIO_AMRBandModeWB3:    return "WB3";
-        case OMX_AUDIO_AMRBandModeWB4:    return "WB4";
-        case OMX_AUDIO_AMRBandModeWB5:    return "WB5";
-        case OMX_AUDIO_AMRBandModeWB6:    return "WB6";
-        case OMX_AUDIO_AMRBandModeWB7:    return "WB7";
-        case OMX_AUDIO_AMRBandModeWB8:    return "WB8";
-        default:                          return def;
-    }
-}
-
-inline static const char *asString(OMX_AUDIO_AMRDTXMODETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_AMRDTXModeOff:    return "ModeOff";
-//      case OMX_AUDIO_AMRDTXModeOnVAD1: return "ModeOnVAD1";
-//      case OMX_AUDIO_AMRDTXModeOnVAD2: return "ModeOnVAD2";
-//      case OMX_AUDIO_AMRDTXModeOnAuto: return "ModeOnAuto";
-//      case OMX_AUDIO_AMRDTXasEFR:      return "asEFR";
-        default:                         return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_AUDIO_H
-
-#endif // OMX_Audio_h
-
-#ifdef OMX_AudioExt_h
-/* asString definitions if media/openmax/OMX_AudioExt.h was included */
-
-#ifndef AS_STRING_FOR_OMX_AUDIOEXT_H
-#define AS_STRING_FOR_OMX_AUDIOEXT_H
-
-inline static const char *asString(OMX_AUDIO_CODINGEXTTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_AUDIO_CodingAndroidAC3:  return "AndroidAC3";
-        case OMX_AUDIO_CodingAndroidOPUS: return "AndroidOPUS";
-        default:                          return asString((OMX_AUDIO_CODINGTYPE)i, def);
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_AUDIOEXT_H
-
-#endif // OMX_AudioExt_h
-
-#ifdef OMX_Component_h
-/* asString definitions if media/openmax/OMX_Component.h was included */
-
-#ifndef AS_STRING_FOR_OMX_COMPONENT_H
-#define AS_STRING_FOR_OMX_COMPONENT_H
-
-inline static const char *asString(OMX_PORTDOMAINTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_PortDomainAudio: return "Audio";
-        case OMX_PortDomainVideo: return "Video";
-        case OMX_PortDomainImage: return "Image";
-//      case OMX_PortDomainOther: return "Other";
-        default:                  return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_COMPONENT_H
-
-#endif // OMX_Component_h
-
-#ifdef OMX_Core_h
-/* asString definitions if media/openmax/OMX_Core.h was included */
-
-#ifndef AS_STRING_FOR_OMX_CORE_H
-#define AS_STRING_FOR_OMX_CORE_H
-
-inline static const char *asString(OMX_COMMANDTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_CommandStateSet:    return "StateSet";
-        case OMX_CommandFlush:       return "Flush";
-        case OMX_CommandPortDisable: return "PortDisable";
-        case OMX_CommandPortEnable:  return "PortEnable";
-//      case OMX_CommandMarkBuffer:  return "MarkBuffer";
-        default:                     return def;
-    }
-}
-
-inline static const char *asString(OMX_STATETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_StateInvalid:          return "Invalid";
-        case OMX_StateLoaded:           return "Loaded";
-        case OMX_StateIdle:             return "Idle";
-        case OMX_StateExecuting:        return "Executing";
-//      case OMX_StatePause:            return "Pause";
-//      case OMX_StateWaitForResources: return "WaitForResources";
-        default:                        return def;
-    }
-}
-
-inline static const char *asString(OMX_ERRORTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_ErrorNone:                               return "None";
-        case OMX_ErrorInsufficientResources:              return "InsufficientResources";
-        case OMX_ErrorUndefined:                          return "Undefined";
-        case OMX_ErrorInvalidComponentName:               return "InvalidComponentName";
-        case OMX_ErrorComponentNotFound:                  return "ComponentNotFound";
-        case OMX_ErrorInvalidComponent:                   return "InvalidComponent";       // unused
-        case OMX_ErrorBadParameter:                       return "BadParameter";
-        case OMX_ErrorNotImplemented:                     return "NotImplemented";
-        case OMX_ErrorUnderflow:                          return "Underflow";              // unused
-        case OMX_ErrorOverflow:                           return "Overflow";               // unused
-        case OMX_ErrorHardware:                           return "Hardware";               // unused
-        case OMX_ErrorInvalidState:                       return "InvalidState";
-        case OMX_ErrorStreamCorrupt:                      return "StreamCorrupt";
-        case OMX_ErrorPortsNotCompatible:                 return "PortsNotCompatible";     // unused
-        case OMX_ErrorResourcesLost:                      return "ResourcesLost";
-        case OMX_ErrorNoMore:                             return "NoMore";
-        case OMX_ErrorVersionMismatch:                    return "VersionMismatch";        // unused
-        case OMX_ErrorNotReady:                           return "NotReady";               // unused
-        case OMX_ErrorTimeout:                            return "Timeout";                // unused
-        case OMX_ErrorSameState:                          return "SameState";              // unused
-        case OMX_ErrorResourcesPreempted:                 return "ResourcesPreempted";     // unused
-        case OMX_ErrorPortUnresponsiveDuringAllocation:
-            return "PortUnresponsiveDuringAllocation";    // unused
-        case OMX_ErrorPortUnresponsiveDuringDeallocation:
-            return "PortUnresponsiveDuringDeallocation";  // unused
-        case OMX_ErrorPortUnresponsiveDuringStop:
-            return "PortUnresponsiveDuringStop";          // unused
-        case OMX_ErrorIncorrectStateTransition:
-            return "IncorrectStateTransition";            // unused
-        case OMX_ErrorIncorrectStateOperation:
-            return "IncorrectStateOperation";             // unused
-        case OMX_ErrorUnsupportedSetting:                 return "UnsupportedSetting";
-        case OMX_ErrorUnsupportedIndex:                   return "UnsupportedIndex";
-        case OMX_ErrorBadPortIndex:                       return "BadPortIndex";
-        case OMX_ErrorPortUnpopulated:                    return "PortUnpopulated";        // unused
-        case OMX_ErrorComponentSuspended:                 return "ComponentSuspended";     // unused
-        case OMX_ErrorDynamicResourcesUnavailable:
-            return "DynamicResourcesUnavailable";         // unused
-        case OMX_ErrorMbErrorsInFrame:                    return "MbErrorsInFrame";        // unused
-        case OMX_ErrorFormatNotDetected:                  return "FormatNotDetected";      // unused
-        case OMX_ErrorContentPipeOpenFailed:              return "ContentPipeOpenFailed";  // unused
-        case OMX_ErrorContentPipeCreationFailed:
-            return "ContentPipeCreationFailed";           // unused
-        case OMX_ErrorSeperateTablesUsed:                 return "SeperateTablesUsed";     // unused
-        case OMX_ErrorTunnelingUnsupported:               return "TunnelingUnsupported";   // unused
-        default:                                          return def;
-    }
-}
-
-inline static const char *asString(OMX_EVENTTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_EventCmdComplete:               return "CmdComplete";
-        case OMX_EventError:                     return "Error";
-//      case OMX_EventMark:                      return "Mark";
-        case OMX_EventPortSettingsChanged:       return "PortSettingsChanged";
-        case OMX_EventBufferFlag:                return "BufferFlag";
-//      case OMX_EventResourcesAcquired:         return "ResourcesAcquired";
-//      case OMX_EventComponentResumed:          return "ComponentResumed";
-//      case OMX_EventDynamicResourcesAvailable: return "DynamicResourcesAvailable";
-//      case OMX_EventPortFormatDetected:        return "PortFormatDetected";
-        case OMX_EventOutputRendered:            return "OutputRendered";
-        case OMX_EventDataSpaceChanged:          return "DataSpaceChanged";
-        default:                                 return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_CORE_H
-
-#endif // OMX_Core_h
-
-#ifdef OMX_Image_h
-/* asString definitions if media/openmax/OMX_Image.h was included */
-
-#ifndef AS_STRING_FOR_OMX_IMAGE_H
-#define AS_STRING_FOR_OMX_IMAGE_H
-
-inline static const char *asString(OMX_IMAGE_CODINGTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_IMAGE_CodingUnused:     return "Unused";
-        case OMX_IMAGE_CodingAutoDetect: return "AutoDetect";  // unused
-        case OMX_IMAGE_CodingJPEG:       return "JPEG";
-        case OMX_IMAGE_CodingJPEG2K:     return "JPEG2K";      // unused
-        case OMX_IMAGE_CodingEXIF:       return "EXIF";        // unused
-        case OMX_IMAGE_CodingTIFF:       return "TIFF";        // unused
-        case OMX_IMAGE_CodingGIF:        return "GIF";         // unused
-        case OMX_IMAGE_CodingPNG:        return "PNG";         // unused
-        case OMX_IMAGE_CodingLZW:        return "LZW";         // unused
-        case OMX_IMAGE_CodingBMP:        return "BMP";         // unused
-        default:                         return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_IMAGE_H
-
-#endif // OMX_Image_h
-
-#ifdef OMX_Index_h
-/* asString definitions if media/openmax/OMX_Index.h was included */
-
-#ifndef AS_STRING_FOR_OMX_INDEX_H
-#define AS_STRING_FOR_OMX_INDEX_H
-
-inline static const char *asString(OMX_INDEXTYPE i, const char *def = "??") {
-    switch (i) {
-//      case OMX_IndexParamPriorityMgmt:                    return "ParamPriorityMgmt";
-//      case OMX_IndexParamAudioInit:                       return "ParamAudioInit";
-//      case OMX_IndexParamImageInit:                       return "ParamImageInit";
-//      case OMX_IndexParamVideoInit:                       return "ParamVideoInit";
-//      case OMX_IndexParamOtherInit:                       return "ParamOtherInit";
-//      case OMX_IndexParamNumAvailableStreams:             return "ParamNumAvailableStreams";
-//      case OMX_IndexParamActiveStream:                    return "ParamActiveStream";
-//      case OMX_IndexParamSuspensionPolicy:                return "ParamSuspensionPolicy";
-//      case OMX_IndexParamComponentSuspended:              return "ParamComponentSuspended";
-//      case OMX_IndexConfigCapturing:                      return "ConfigCapturing";
-//      case OMX_IndexConfigCaptureMode:                    return "ConfigCaptureMode";
-//      case OMX_IndexAutoPauseAfterCapture:                return "AutoPauseAfterCapture";
-//      case OMX_IndexParamContentURI:                      return "ParamContentURI";
-//      case OMX_IndexParamCustomContentPipe:               return "ParamCustomContentPipe";
-//      case OMX_IndexParamDisableResourceConcealment:
-//          return "ParamDisableResourceConcealment";
-//      case OMX_IndexConfigMetadataItemCount:              return "ConfigMetadataItemCount";
-//      case OMX_IndexConfigContainerNodeCount:             return "ConfigContainerNodeCount";
-//      case OMX_IndexConfigMetadataItem:                   return "ConfigMetadataItem";
-//      case OMX_IndexConfigCounterNodeID:                  return "ConfigCounterNodeID";
-//      case OMX_IndexParamMetadataFilterType:              return "ParamMetadataFilterType";
-//      case OMX_IndexParamMetadataKeyFilter:               return "ParamMetadataKeyFilter";
-//      case OMX_IndexConfigPriorityMgmt:                   return "ConfigPriorityMgmt";
-        case OMX_IndexParamStandardComponentRole:           return "ParamStandardComponentRole";
-        case OMX_IndexParamPortDefinition:                  return "ParamPortDefinition";
-//      case OMX_IndexParamCompBufferSupplier:              return "ParamCompBufferSupplier";
-        case OMX_IndexParamAudioPortFormat:                 return "ParamAudioPortFormat";
-        case OMX_IndexParamAudioPcm:                        return "ParamAudioPcm";
-        case OMX_IndexParamAudioAac:                        return "ParamAudioAac";
-//      case OMX_IndexParamAudioRa:                         return "ParamAudioRa";
-        case OMX_IndexParamAudioMp3:                        return "ParamAudioMp3";
-//      case OMX_IndexParamAudioAdpcm:                      return "ParamAudioAdpcm";
-//      case OMX_IndexParamAudioG723:                       return "ParamAudioG723";
-//      case OMX_IndexParamAudioG729:                       return "ParamAudioG729";
-        case OMX_IndexParamAudioAmr:                        return "ParamAudioAmr";
-//      case OMX_IndexParamAudioWma:                        return "ParamAudioWma";
-//      case OMX_IndexParamAudioSbc:                        return "ParamAudioSbc";
-//      case OMX_IndexParamAudioMidi:                       return "ParamAudioMidi";
-//      case OMX_IndexParamAudioGsm_FR:                     return "ParamAudioGsm_FR";
-//      case OMX_IndexParamAudioMidiLoadUserSound:          return "ParamAudioMidiLoadUserSound";
-//      case OMX_IndexParamAudioG726:                       return "ParamAudioG726";
-//      case OMX_IndexParamAudioGsm_EFR:                    return "ParamAudioGsm_EFR";
-//      case OMX_IndexParamAudioGsm_HR:                     return "ParamAudioGsm_HR";
-//      case OMX_IndexParamAudioPdc_FR:                     return "ParamAudioPdc_FR";
-//      case OMX_IndexParamAudioPdc_EFR:                    return "ParamAudioPdc_EFR";
-//      case OMX_IndexParamAudioPdc_HR:                     return "ParamAudioPdc_HR";
-//      case OMX_IndexParamAudioTdma_FR:                    return "ParamAudioTdma_FR";
-//      case OMX_IndexParamAudioTdma_EFR:                   return "ParamAudioTdma_EFR";
-//      case OMX_IndexParamAudioQcelp8:                     return "ParamAudioQcelp8";
-//      case OMX_IndexParamAudioQcelp13:                    return "ParamAudioQcelp13";
-//      case OMX_IndexParamAudioEvrc:                       return "ParamAudioEvrc";
-//      case OMX_IndexParamAudioSmv:                        return "ParamAudioSmv";
-        case OMX_IndexParamAudioVorbis:                     return "ParamAudioVorbis";
-        case OMX_IndexParamAudioFlac:                       return "ParamAudioFlac";
-//      case OMX_IndexConfigAudioMidiImmediateEvent:        return "ConfigAudioMidiImmediateEvent";
-//      case OMX_IndexConfigAudioMidiControl:               return "ConfigAudioMidiControl";
-//      case OMX_IndexConfigAudioMidiSoundBankProgram:
-//          return "ConfigAudioMidiSoundBankProgram";
-//      case OMX_IndexConfigAudioMidiStatus:                return "ConfigAudioMidiStatus";
-//      case OMX_IndexConfigAudioMidiMetaEvent:             return "ConfigAudioMidiMetaEvent";
-//      case OMX_IndexConfigAudioMidiMetaEventData:         return "ConfigAudioMidiMetaEventData";
-//      case OMX_IndexConfigAudioVolume:                    return "ConfigAudioVolume";
-//      case OMX_IndexConfigAudioBalance:                   return "ConfigAudioBalance";
-//      case OMX_IndexConfigAudioChannelMute:               return "ConfigAudioChannelMute";
-//      case OMX_IndexConfigAudioMute:                      return "ConfigAudioMute";
-//      case OMX_IndexConfigAudioLoudness:                  return "ConfigAudioLoudness";
-//      case OMX_IndexConfigAudioEchoCancelation:           return "ConfigAudioEchoCancelation";
-//      case OMX_IndexConfigAudioNoiseReduction:            return "ConfigAudioNoiseReduction";
-//      case OMX_IndexConfigAudioBass:                      return "ConfigAudioBass";
-//      case OMX_IndexConfigAudioTreble:                    return "ConfigAudioTreble";
-//      case OMX_IndexConfigAudioStereoWidening:            return "ConfigAudioStereoWidening";
-//      case OMX_IndexConfigAudioChorus:                    return "ConfigAudioChorus";
-//      case OMX_IndexConfigAudioEqualizer:                 return "ConfigAudioEqualizer";
-//      case OMX_IndexConfigAudioReverberation:             return "ConfigAudioReverberation";
-//      case OMX_IndexConfigAudioChannelVolume:             return "ConfigAudioChannelVolume";
-//      case OMX_IndexParamImagePortFormat:                 return "ParamImagePortFormat";
-//      case OMX_IndexParamFlashControl:                    return "ParamFlashControl";
-//      case OMX_IndexConfigFocusControl:                   return "ConfigFocusControl";
-//      case OMX_IndexParamQFactor:                         return "ParamQFactor";
-//      case OMX_IndexParamQuantizationTable:               return "ParamQuantizationTable";
-//      case OMX_IndexParamHuffmanTable:                    return "ParamHuffmanTable";
-//      case OMX_IndexConfigFlashControl:                   return "ConfigFlashControl";
-        case OMX_IndexParamVideoPortFormat:                 return "ParamVideoPortFormat";
-//      case OMX_IndexParamVideoQuantization:               return "ParamVideoQuantization";
-//      case OMX_IndexParamVideoFastUpdate:                 return "ParamVideoFastUpdate";
-        case OMX_IndexParamVideoBitrate:                    return "ParamVideoBitrate";
-//      case OMX_IndexParamVideoMotionVector:               return "ParamVideoMotionVector";
-        case OMX_IndexParamVideoIntraRefresh:               return "ParamVideoIntraRefresh";
-        case OMX_IndexParamVideoErrorCorrection:            return "ParamVideoErrorCorrection";
-//      case OMX_IndexParamVideoVBSMC:                      return "ParamVideoVBSMC";
-//      case OMX_IndexParamVideoMpeg2:                      return "ParamVideoMpeg2";
-        case OMX_IndexParamVideoMpeg4:                      return "ParamVideoMpeg4";
-//      case OMX_IndexParamVideoWmv:                        return "ParamVideoWmv";
-//      case OMX_IndexParamVideoRv:                         return "ParamVideoRv";
-        case OMX_IndexParamVideoAvc:                        return "ParamVideoAvc";
-        case OMX_IndexParamVideoH263:                       return "ParamVideoH263";
-        case OMX_IndexParamVideoProfileLevelQuerySupported:
-            return "ParamVideoProfileLevelQuerySupported";
-        case OMX_IndexParamVideoProfileLevelCurrent:        return "ParamVideoProfileLevelCurrent";
-        case OMX_IndexConfigVideoBitrate:                   return "ConfigVideoBitrate";
-//      case OMX_IndexConfigVideoFramerate:                 return "ConfigVideoFramerate";
-        case OMX_IndexConfigVideoIntraVOPRefresh:           return "ConfigVideoIntraVOPRefresh";
-//      case OMX_IndexConfigVideoIntraMBRefresh:            return "ConfigVideoIntraMBRefresh";
-//      case OMX_IndexConfigVideoMBErrorReporting:          return "ConfigVideoMBErrorReporting";
-//      case OMX_IndexParamVideoMacroblocksPerFrame:        return "ParamVideoMacroblocksPerFrame";
-//      case OMX_IndexConfigVideoMacroBlockErrorMap:        return "ConfigVideoMacroBlockErrorMap";
-//      case OMX_IndexParamVideoSliceFMO:                   return "ParamVideoSliceFMO";
-//      case OMX_IndexConfigVideoAVCIntraPeriod:            return "ConfigVideoAVCIntraPeriod";
-//      case OMX_IndexConfigVideoNalSize:                   return "ConfigVideoNalSize";
-//      case OMX_IndexParamCommonDeblocking:                return "ParamCommonDeblocking";
-//      case OMX_IndexParamCommonSensorMode:                return "ParamCommonSensorMode";
-//      case OMX_IndexParamCommonInterleave:                return "ParamCommonInterleave";
-//      case OMX_IndexConfigCommonColorFormatConversion:
-//          return "ConfigCommonColorFormatConversion";
-        case OMX_IndexConfigCommonScale:                    return "ConfigCommonScale";
-//      case OMX_IndexConfigCommonImageFilter:              return "ConfigCommonImageFilter";
-//      case OMX_IndexConfigCommonColorEnhancement:         return "ConfigCommonColorEnhancement";
-//      case OMX_IndexConfigCommonColorKey:                 return "ConfigCommonColorKey";
-//      case OMX_IndexConfigCommonColorBlend:               return "ConfigCommonColorBlend";
-//      case OMX_IndexConfigCommonFrameStabilisation:       return "ConfigCommonFrameStabilisation";
-//      case OMX_IndexConfigCommonRotate:                   return "ConfigCommonRotate";
-//      case OMX_IndexConfigCommonMirror:                   return "ConfigCommonMirror";
-//      case OMX_IndexConfigCommonOutputPosition:           return "ConfigCommonOutputPosition";
-        case OMX_IndexConfigCommonInputCrop:                return "ConfigCommonInputCrop";
-        case OMX_IndexConfigCommonOutputCrop:               return "ConfigCommonOutputCrop";
-//      case OMX_IndexConfigCommonDigitalZoom:              return "ConfigCommonDigitalZoom";
-//      case OMX_IndexConfigCommonOpticalZoom:              return "ConfigCommonOpticalZoom";
-//      case OMX_IndexConfigCommonWhiteBalance:             return "ConfigCommonWhiteBalance";
-//      case OMX_IndexConfigCommonExposure:                 return "ConfigCommonExposure";
-//      case OMX_IndexConfigCommonContrast:                 return "ConfigCommonContrast";
-//      case OMX_IndexConfigCommonBrightness:               return "ConfigCommonBrightness";
-//      case OMX_IndexConfigCommonBacklight:                return "ConfigCommonBacklight";
-//      case OMX_IndexConfigCommonGamma:                    return "ConfigCommonGamma";
-//      case OMX_IndexConfigCommonSaturation:               return "ConfigCommonSaturation";
-//      case OMX_IndexConfigCommonLightness:                return "ConfigCommonLightness";
-//      case OMX_IndexConfigCommonExclusionRect:            return "ConfigCommonExclusionRect";
-//      case OMX_IndexConfigCommonDithering:                return "ConfigCommonDithering";
-//      case OMX_IndexConfigCommonPlaneBlend:               return "ConfigCommonPlaneBlend";
-//      case OMX_IndexConfigCommonExposureValue:            return "ConfigCommonExposureValue";
-//      case OMX_IndexConfigCommonOutputSize:               return "ConfigCommonOutputSize";
-//      case OMX_IndexParamCommonExtraQuantData:            return "ParamCommonExtraQuantData";
-//      case OMX_IndexConfigCommonFocusRegion:              return "ConfigCommonFocusRegion";
-//      case OMX_IndexConfigCommonFocusStatus:              return "ConfigCommonFocusStatus";
-//      case OMX_IndexConfigCommonTransitionEffect:         return "ConfigCommonTransitionEffect";
-//      case OMX_IndexParamOtherPortFormat:                 return "ParamOtherPortFormat";
-//      case OMX_IndexConfigOtherPower:                     return "ConfigOtherPower";
-//      case OMX_IndexConfigOtherStats:                     return "ConfigOtherStats";
-//      case OMX_IndexConfigTimeScale:                      return "ConfigTimeScale";
-//      case OMX_IndexConfigTimeClockState:                 return "ConfigTimeClockState";
-//      case OMX_IndexConfigTimeActiveRefClock:             return "ConfigTimeActiveRefClock";
-//      case OMX_IndexConfigTimeCurrentMediaTime:           return "ConfigTimeCurrentMediaTime";
-//      case OMX_IndexConfigTimeCurrentWallTime:            return "ConfigTimeCurrentWallTime";
-//      case OMX_IndexConfigTimeCurrentAudioReference:
-//          return "ConfigTimeCurrentAudioReference";
-//      case OMX_IndexConfigTimeCurrentVideoReference:
-//          return "ConfigTimeCurrentVideoReference";
-//      case OMX_IndexConfigTimeMediaTimeRequest:           return "ConfigTimeMediaTimeRequest";
-//      case OMX_IndexConfigTimeClientStartTime:            return "ConfigTimeClientStartTime";
-//      case OMX_IndexConfigTimePosition:                   return "ConfigTimePosition";
-//      case OMX_IndexConfigTimeSeekMode:                   return "ConfigTimeSeekMode";
-        default:                                            return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_INDEX_H
-
-#endif // OMX_Index_h
-
-#ifdef OMX_IndexExt_h
-/* asString definitions if media/openmax/OMX_IndexExt.h was included */
-
-#ifndef AS_STRING_FOR_OMX_INDEXEXT_H
-#define AS_STRING_FOR_OMX_INDEXEXT_H
-
-inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") {
-    switch (i) {
-//      case OMX_IndexConfigCallbackRequest:            return "ConfigCallbackRequest";
-//      case OMX_IndexConfigCommitMode:                 return "ConfigCommitMode";
-//      case OMX_IndexConfigCommit:                     return "ConfigCommit";
-        case OMX_IndexConfigAndroidVendorExtension:     return "ConfigAndroidVendorExtension";
-        case OMX_IndexParamAudioAndroidAc3:             return "ParamAudioAndroidAc3";
-        case OMX_IndexParamAudioAndroidOpus:            return "ParamAudioAndroidOpus";
-        case OMX_IndexParamAudioAndroidAacPresentation: return "ParamAudioAndroidAacPresentation";
-        case OMX_IndexParamAudioAndroidEac3:            return "ParamAudioAndroidEac3";
-        case OMX_IndexParamAudioProfileQuerySupported:  return "ParamAudioProfileQuerySupported";
-//      case OMX_IndexParamNalStreamFormatSupported:    return "ParamNalStreamFormatSupported";
-//      case OMX_IndexParamNalStreamFormat:             return "ParamNalStreamFormat";
-//      case OMX_IndexParamNalStreamFormatSelect:       return "ParamNalStreamFormatSelect";
-        case OMX_IndexParamVideoVp8:                    return "ParamVideoVp8";
-//      case OMX_IndexConfigVideoVp8ReferenceFrame:     return "ConfigVideoVp8ReferenceFrame";
-//      case OMX_IndexConfigVideoVp8ReferenceFrameType: return "ConfigVideoVp8ReferenceFrameType";
-        case OMX_IndexParamVideoAndroidVp8Encoder:      return "ParamVideoAndroidVp8Encoder";
-        case OMX_IndexParamVideoHevc:                   return "ParamVideoHevc";
-//      case OMX_IndexParamSliceSegments:               return "ParamSliceSegments";
-        case OMX_IndexConfigAndroidIntraRefresh:        return "ConfigAndroidIntraRefresh";
-        case OMX_IndexParamAndroidVideoTemporalLayering: return "ParamAndroidVideoTemporalLayering";
-        case OMX_IndexConfigAndroidVideoTemporalLayering: return "ConfigAndroidVideoTemporalLayering";
-        case OMX_IndexParamMaxFrameDurationForBitrateControl:
-            return "ParamMaxFrameDurationForBitrateControl";
-        case OMX_IndexParamVideoVp9:                    return "ParamVideoVp9";
-        case OMX_IndexParamVideoAndroidVp9Encoder:      return "ParamVideoAndroidVp9Encoder";
-        case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";
-        case OMX_IndexConfigPriority:                   return "ConfigPriority";
-        case OMX_IndexConfigOperatingRate:              return "ConfigOperatingRate";
-        case OMX_IndexParamConsumerUsageBits:           return "ParamConsumerUsageBits";
-        case OMX_IndexConfigLatency:                    return "ConfigLatency";
-        default:                                        return asString((OMX_INDEXTYPE)i, def);
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_INDEXEXT_H
-
-#endif // OMX_IndexExt_h
-
-#ifdef OMX_IVCommon_h
-/* asString definitions if media/openmax/OMX_IVCommon.h was included */
-
-#ifndef AS_STRING_FOR_OMX_IVCOMMON_H
-#define AS_STRING_FOR_OMX_IVCOMMON_H
-
-inline static const char *asString(OMX_COLOR_FORMATTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_COLOR_FormatUnused:
-            return "COLOR_FormatUnused";
-        case OMX_COLOR_FormatMonochrome:
-            return "COLOR_FormatMonochrome";
-        case OMX_COLOR_Format8bitRGB332:
-            return "COLOR_Format8bitRGB332";
-        case OMX_COLOR_Format12bitRGB444:
-            return "COLOR_Format12bitRGB444";
-        case OMX_COLOR_Format16bitARGB4444:
-            return "COLOR_Format16bitARGB4444";
-        case OMX_COLOR_Format16bitARGB1555:
-            return "COLOR_Format16bitARGB1555";
-        case OMX_COLOR_Format16bitRGB565:
-            return "COLOR_Format16bitRGB565";
-        case OMX_COLOR_Format16bitBGR565:
-            return "COLOR_Format16bitBGR565";
-        case OMX_COLOR_Format18bitRGB666:
-            return "COLOR_Format18bitRGB666";
-        case OMX_COLOR_Format18bitARGB1665:
-            return "COLOR_Format18bitARGB1665";
-        case OMX_COLOR_Format19bitARGB1666:
-            return "COLOR_Format19bitARGB1666";
-        case OMX_COLOR_Format24bitRGB888:
-            return "COLOR_Format24bitRGB888";
-        case OMX_COLOR_Format24bitBGR888:
-            return "COLOR_Format24bitBGR888";
-        case OMX_COLOR_Format24bitARGB1887:
-            return "COLOR_Format24bitARGB1887";
-        case OMX_COLOR_Format25bitARGB1888:
-            return "COLOR_Format25bitARGB1888";
-        case OMX_COLOR_Format32bitBGRA8888:
-            return "COLOR_Format32bitBGRA8888";
-        case OMX_COLOR_Format32bitARGB8888:
-            return "COLOR_Format32bitARGB8888";
-        case OMX_COLOR_FormatYUV411Planar:
-            return "COLOR_FormatYUV411Planar";
-        case OMX_COLOR_FormatYUV411PackedPlanar:
-            return "COLOR_FormatYUV411PackedPlanar";
-        case OMX_COLOR_FormatYUV420Planar:
-            return "COLOR_FormatYUV420Planar";
-        case OMX_COLOR_FormatYUV420PackedPlanar:
-            return "COLOR_FormatYUV420PackedPlanar";
-        case OMX_COLOR_FormatYUV420SemiPlanar:
-            return "COLOR_FormatYUV420SemiPlanar";
-        case OMX_COLOR_FormatYUV422Planar:
-            return "COLOR_FormatYUV422Planar";
-        case OMX_COLOR_FormatYUV422PackedPlanar:
-            return "COLOR_FormatYUV422PackedPlanar";
-        case OMX_COLOR_FormatYUV422SemiPlanar:
-            return "COLOR_FormatYUV422SemiPlanar";
-        case OMX_COLOR_FormatYCbYCr:
-            return "COLOR_FormatYCbYCr";
-        case OMX_COLOR_FormatYCrYCb:
-            return "COLOR_FormatYCrYCb";
-        case OMX_COLOR_FormatCbYCrY:
-            return "COLOR_FormatCbYCrY";
-        case OMX_COLOR_FormatCrYCbY:
-            return "COLOR_FormatCrYCbY";
-        case OMX_COLOR_FormatYUV444Interleaved:
-            return "COLOR_FormatYUV444Interleaved";
-        case OMX_COLOR_FormatRawBayer8bit:
-            return "COLOR_FormatRawBayer8bit";
-        case OMX_COLOR_FormatRawBayer10bit:
-            return "COLOR_FormatRawBayer10bit";
-        case OMX_COLOR_FormatRawBayer8bitcompressed:
-            return "COLOR_FormatRawBayer8bitcompressed";
-        case OMX_COLOR_FormatL2:
-            return "COLOR_FormatL2";
-        case OMX_COLOR_FormatL4:
-            return "COLOR_FormatL4";
-        case OMX_COLOR_FormatL8:
-            return "COLOR_FormatL8";
-        case OMX_COLOR_FormatL16:
-            return "COLOR_FormatL16";
-        case OMX_COLOR_FormatL24:
-            return "COLOR_FormatL24";
-        case OMX_COLOR_FormatL32:
-            return "COLOR_FormatL32";
-        case OMX_COLOR_FormatYUV420PackedSemiPlanar:
-            return "COLOR_FormatYUV420PackedSemiPlanar";
-        case OMX_COLOR_FormatYUV422PackedSemiPlanar:
-            return "COLOR_FormatYUV422PackedSemiPlanar";
-        case OMX_COLOR_Format18BitBGR666:
-            return "COLOR_Format18BitBGR666";
-        case OMX_COLOR_Format24BitARGB6666:
-            return "COLOR_Format24BitARGB6666";
-        case OMX_COLOR_Format24BitABGR6666:
-            return "COLOR_Format24BitABGR6666";
-        case OMX_COLOR_FormatAndroidOpaque:
-            return "COLOR_FormatAndroidOpaque";
-        case OMX_COLOR_FormatYUV420Flexible:
-            return "COLOR_FormatYUV420Flexible";
-        case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
-            return "TI_COLOR_FormatYUV420PackedSemiPlanar";
-        case OMX_QCOM_COLOR_FormatYVU420SemiPlanar:
-            return "QCOM_COLOR_FormatYVU420SemiPlanar";
-//      case OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka:
-//          return "QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka";
-//      case OMX_SEC_COLOR_FormatNV12Tiled:
-//          return "SEC_COLOR_FormatNV12Tiled";
-//      case OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m:
-//          return "QCOM_COLOR_FormatYUV420PackedSemiPlanar32m";
-        default:
-            return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_IVCOMMON_H
-
-#endif // OMX_IVCommon_h
-
-#ifdef OMX_Types_h
-/* asString definitions if media/openmax/OMX_Types.h was included */
-
-#ifndef AS_STRING_FOR_OMX_TYPES_H
-#define AS_STRING_FOR_OMX_TYPES_H
-
-inline static const char *asString(OMX_BOOL i, const char *def = "??") {
-    switch (i) {
-        case OMX_FALSE: return "FALSE";
-        case OMX_TRUE:  return "TRUE";
-        default:        return def;
-    }
-}
-
-inline static const char *asString(OMX_DIRTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_DirInput:  return "Input";
-        case OMX_DirOutput: return "Output";
-        default:            return def;
-    }
-}
-
-inline static const char *asString(OMX_ENDIANTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_EndianBig:    return "Big";
-//      case OMX_EndianLittle: return "Little";
-        default:               return def;
-    }
-}
-
-inline static const char *asString(OMX_NUMERICALDATATYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_NumericalDataSigned:   return "Signed";
-//      case OMX_NumericalDataUnsigned: return "Unsigned";
-        default:                        return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_TYPES_H
-
-#endif // OMX_Types_h
-
-#ifdef OMX_Video_h
-/* asString definitions if media/openmax/OMX_Video.h was included */
-
-#ifndef AS_STRING_FOR_OMX_VIDEO_H
-#define AS_STRING_FOR_OMX_VIDEO_H
-
-inline static const char *asString(OMX_VIDEO_CODINGTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_CodingUnused:     return "Unused";
-        case OMX_VIDEO_CodingAutoDetect: return "AutoDetect";  // unused
-        case OMX_VIDEO_CodingMPEG2:      return "MPEG2";
-        case OMX_VIDEO_CodingH263:       return "H263";
-        case OMX_VIDEO_CodingMPEG4:      return "MPEG4";
-        case OMX_VIDEO_CodingWMV:        return "WMV";         // unused
-        case OMX_VIDEO_CodingRV:         return "RV";          // unused
-        case OMX_VIDEO_CodingAVC:        return "AVC";
-        case OMX_VIDEO_CodingMJPEG:      return "MJPEG";       // unused
-        case OMX_VIDEO_CodingVP8:        return "VP8";
-        case OMX_VIDEO_CodingVP9:        return "VP9";
-        case OMX_VIDEO_CodingHEVC:       return "HEVC";
-        case OMX_VIDEO_CodingDolbyVision:return "DolbyVision";
-        default:                         return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_CONTROLRATETYPE i, const char *def = "??") {
-    switch (i) {
-//      case OMX_Video_ControlRateDisable:            return "Disable";
-        case OMX_Video_ControlRateVariable:           return "Variable";
-        case OMX_Video_ControlRateConstant:           return "Constant";
-//      case OMX_Video_ControlRateVariableSkipFrames: return "VariableSkipFrames";
-//      case OMX_Video_ControlRateConstantSkipFrames: return "ConstantSkipFrames";
-        default:                                      return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_INTRAREFRESHTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_IntraRefreshCyclic:   return "Cyclic";
-        case OMX_VIDEO_IntraRefreshAdaptive: return "Adaptive";
-        case OMX_VIDEO_IntraRefreshBoth:     return "Both";
-        default:                             return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_H263PROFILETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_H263ProfileBaseline:           return "Baseline";
-        case OMX_VIDEO_H263ProfileH320Coding:         return "H320Coding";
-        case OMX_VIDEO_H263ProfileBackwardCompatible: return "BackwardCompatible";
-        case OMX_VIDEO_H263ProfileISWV2:              return "ISWV2";
-        case OMX_VIDEO_H263ProfileISWV3:              return "ISWV3";
-        case OMX_VIDEO_H263ProfileHighCompression:    return "HighCompression";
-        case OMX_VIDEO_H263ProfileInternet:           return "Internet";
-        case OMX_VIDEO_H263ProfileInterlace:          return "Interlace";
-        case OMX_VIDEO_H263ProfileHighLatency:        return "HighLatency";
-        default:                                      return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_H263LEVELTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_H263Level10: return "Level10";
-        case OMX_VIDEO_H263Level20: return "Level20";
-        case OMX_VIDEO_H263Level30: return "Level30";
-        case OMX_VIDEO_H263Level40: return "Level40";
-        case OMX_VIDEO_H263Level45: return "Level45";
-        case OMX_VIDEO_H263Level50: return "Level50";
-        case OMX_VIDEO_H263Level60: return "Level60";
-        case OMX_VIDEO_H263Level70: return "Level70";
-        default:                    return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_PICTURETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_PictureTypeI:  return "I";
-        case OMX_VIDEO_PictureTypeP:  return "P";
-        case OMX_VIDEO_PictureTypeB:  return "B";
-//      case OMX_VIDEO_PictureTypeSI: return "SI";
-//      case OMX_VIDEO_PictureTypeSP: return "SP";
-//      case OMX_VIDEO_PictureTypeEI: return "EI";
-//      case OMX_VIDEO_PictureTypeEP: return "EP";
-//      case OMX_VIDEO_PictureTypeS:  return "S";
-        default:                      return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_MPEG4PROFILETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_MPEG4ProfileSimple:           return "Simple";
-        case OMX_VIDEO_MPEG4ProfileSimpleScalable:   return "SimpleScalable";
-        case OMX_VIDEO_MPEG4ProfileCore:             return "Core";
-        case OMX_VIDEO_MPEG4ProfileMain:             return "Main";
-        case OMX_VIDEO_MPEG4ProfileNbit:             return "Nbit";
-        case OMX_VIDEO_MPEG4ProfileScalableTexture:  return "ScalableTexture";
-        case OMX_VIDEO_MPEG4ProfileSimpleFace:       return "SimpleFace";
-        case OMX_VIDEO_MPEG4ProfileSimpleFBA:        return "SimpleFBA";
-        case OMX_VIDEO_MPEG4ProfileBasicAnimated:    return "BasicAnimated";
-        case OMX_VIDEO_MPEG4ProfileHybrid:           return "Hybrid";
-        case OMX_VIDEO_MPEG4ProfileAdvancedRealTime: return "AdvancedRealTime";
-        case OMX_VIDEO_MPEG4ProfileCoreScalable:     return "CoreScalable";
-        case OMX_VIDEO_MPEG4ProfileAdvancedCoding:   return "AdvancedCoding";
-        case OMX_VIDEO_MPEG4ProfileAdvancedCore:     return "AdvancedCore";
-        case OMX_VIDEO_MPEG4ProfileAdvancedScalable: return "AdvancedScalable";
-        case OMX_VIDEO_MPEG4ProfileAdvancedSimple:   return "AdvancedSimple";
-        default:                                     return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_MPEG4LEVELTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_MPEG4Level0:  return "Level0";
-        case OMX_VIDEO_MPEG4Level0b: return "Level0b";
-        case OMX_VIDEO_MPEG4Level1:  return "Level1";
-        case OMX_VIDEO_MPEG4Level2:  return "Level2";
-        case OMX_VIDEO_MPEG4Level3:  return "Level3";
-        case OMX_VIDEO_MPEG4Level3b: return "Level3b";
-        case OMX_VIDEO_MPEG4Level4:  return "Level4";
-        case OMX_VIDEO_MPEG4Level4a: return "Level4a";
-        case OMX_VIDEO_MPEG4Level5:  return "Level5";
-        case OMX_VIDEO_MPEG4Level6:  return "Level6";
-        default:                     return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_MPEG2PROFILETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_MPEG2ProfileSimple:  return "Simple";
-        case OMX_VIDEO_MPEG2ProfileMain:    return "Main";
-        case OMX_VIDEO_MPEG2Profile422:     return "4:2:2";
-        case OMX_VIDEO_MPEG2ProfileSNR:     return "SNR";
-        case OMX_VIDEO_MPEG2ProfileSpatial: return "Spatial";
-        case OMX_VIDEO_MPEG2ProfileHigh:    return "High";
-        default:                            return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_MPEG2LEVELTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_MPEG2LevelLL:  return "Low";
-        case OMX_VIDEO_MPEG2LevelML:  return "Main";
-        case OMX_VIDEO_MPEG2LevelH14: return "High1440";
-        case OMX_VIDEO_MPEG2LevelHL:  return "High";
-        default:                      return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_AVCPROFILETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_AVCProfileBaseline: return "Baseline";
-        case OMX_VIDEO_AVCProfileMain:     return "Main";
-        case OMX_VIDEO_AVCProfileExtended: return "Extended";
-        case OMX_VIDEO_AVCProfileHigh:     return "High";
-        case OMX_VIDEO_AVCProfileHigh10:   return "High10";
-        case OMX_VIDEO_AVCProfileHigh422:  return "High422";
-        case OMX_VIDEO_AVCProfileHigh444:  return "High444";
-        default:                           return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_AVCLEVELTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_AVCLevel1:  return "Level1";
-        case OMX_VIDEO_AVCLevel1b: return "Level1b";
-        case OMX_VIDEO_AVCLevel11: return "Level11";
-        case OMX_VIDEO_AVCLevel12: return "Level12";
-        case OMX_VIDEO_AVCLevel13: return "Level13";
-        case OMX_VIDEO_AVCLevel2:  return "Level2";
-        case OMX_VIDEO_AVCLevel21: return "Level21";
-        case OMX_VIDEO_AVCLevel22: return "Level22";
-        case OMX_VIDEO_AVCLevel3:  return "Level3";
-        case OMX_VIDEO_AVCLevel31: return "Level31";
-        case OMX_VIDEO_AVCLevel32: return "Level32";
-        case OMX_VIDEO_AVCLevel4:  return "Level4";
-        case OMX_VIDEO_AVCLevel41: return "Level41";
-        case OMX_VIDEO_AVCLevel42: return "Level42";
-        case OMX_VIDEO_AVCLevel5:  return "Level5";
-        case OMX_VIDEO_AVCLevel51: return "Level51";
-        case OMX_VIDEO_AVCLevel52: return "Level52";
-        default:                   return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_AVCLOOPFILTERTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_AVCLoopFilterEnable:               return "Enable";
-//      case OMX_VIDEO_AVCLoopFilterDisable:              return "Disable";
-//      case OMX_VIDEO_AVCLoopFilterDisableSliceBoundary: return "DisableSliceBoundary";
-        default:                                          return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_VIDEO_H
-
-#endif // OMX_Video_h
-
-#ifdef OMX_VideoExt_h
-/* asString definitions if media/openmax/OMX_VideoExt.h was included */
-
-#ifndef AS_STRING_FOR_OMX_VIDEOEXT_H
-#define AS_STRING_FOR_OMX_VIDEOEXT_H
-
-inline static const char *asString(OMX_VIDEO_VP8PROFILETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_VP8ProfileMain:    return "Main";
-        case OMX_VIDEO_VP8ProfileUnknown: return "Unknown";  // unused
-        default:                          return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_VP8LEVELTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_VP8Level_Version0: return "_Version0";
-        case OMX_VIDEO_VP8Level_Version1: return "_Version1";
-        case OMX_VIDEO_VP8Level_Version2: return "_Version2";
-        case OMX_VIDEO_VP8Level_Version3: return "_Version3";
-        case OMX_VIDEO_VP8LevelUnknown:   return "Unknown";    // unused
-        default:                          return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_VP9PROFILETYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_VP9Profile0:    return "Profile0";
-        case OMX_VIDEO_VP9Profile1:    return "Profile1";
-        case OMX_VIDEO_VP9Profile2:    return "Profile2";
-        case OMX_VIDEO_VP9Profile3:    return "Profile3";
-        case OMX_VIDEO_VP9Profile2HDR: return "Profile2HDR";
-        case OMX_VIDEO_VP9Profile3HDR: return "Profile3HDR";
-        default:                       return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_VP9LEVELTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_VP9Level1:  return "Level1";
-        case OMX_VIDEO_VP9Level11: return "Level11";
-        case OMX_VIDEO_VP9Level2:  return "Level2";
-        case OMX_VIDEO_VP9Level21: return "Level21";
-        case OMX_VIDEO_VP9Level3:  return "Level3";
-        case OMX_VIDEO_VP9Level31: return "Level31";
-        case OMX_VIDEO_VP9Level4:  return "Level4";
-        case OMX_VIDEO_VP9Level41: return "Level41";
-        case OMX_VIDEO_VP9Level5:  return "Level5";
-        case OMX_VIDEO_VP9Level51: return "Level51";
-        case OMX_VIDEO_VP9Level52: return "Level52";
-        case OMX_VIDEO_VP9Level6:  return "Level6";
-        case OMX_VIDEO_VP9Level61: return "Level61";
-        case OMX_VIDEO_VP9Level62: return "Level62";
-        default:                   return def;
-    }
-}
-
-inline static const char *asString(
-        OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_VPXTemporalLayerPatternNone:   return "None";
-        case OMX_VIDEO_VPXTemporalLayerPatternWebRTC: return "WebRTC";
-        default:                                      return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_HEVCPROFILETYPE i, const char *def = "!!") {
-    switch (i) {
-        case OMX_VIDEO_HEVCProfileUnknown:      return "Unknown";  // unused
-        case OMX_VIDEO_HEVCProfileMain:         return "Main";
-        case OMX_VIDEO_HEVCProfileMain10:       return "Main10";
-        case OMX_VIDEO_HEVCProfileMain10HDR10:  return "Main10HDR10";
-        default:                                return def;
-    }
-}
-
-inline static const char *asString(OMX_VIDEO_HEVCLEVELTYPE i, const char *def = "!!") {
-    switch (i) {
-        case OMX_VIDEO_HEVCLevelUnknown:    return "LevelUnknown";     // unused
-        case OMX_VIDEO_HEVCMainTierLevel1:  return "MainTierLevel1";
-        case OMX_VIDEO_HEVCHighTierLevel1:  return "HighTierLevel1";
-        case OMX_VIDEO_HEVCMainTierLevel2:  return "MainTierLevel2";
-        case OMX_VIDEO_HEVCHighTierLevel2:  return "HighTierLevel2";
-        case OMX_VIDEO_HEVCMainTierLevel21: return "MainTierLevel21";
-        case OMX_VIDEO_HEVCHighTierLevel21: return "HighTierLevel21";
-        case OMX_VIDEO_HEVCMainTierLevel3:  return "MainTierLevel3";
-        case OMX_VIDEO_HEVCHighTierLevel3:  return "HighTierLevel3";
-        case OMX_VIDEO_HEVCMainTierLevel31: return "MainTierLevel31";
-        case OMX_VIDEO_HEVCHighTierLevel31: return "HighTierLevel31";
-        case OMX_VIDEO_HEVCMainTierLevel4:  return "MainTierLevel4";
-        case OMX_VIDEO_HEVCHighTierLevel4:  return "HighTierLevel4";
-        case OMX_VIDEO_HEVCMainTierLevel41: return "MainTierLevel41";
-        case OMX_VIDEO_HEVCHighTierLevel41: return "HighTierLevel41";
-        case OMX_VIDEO_HEVCMainTierLevel5:  return "MainTierLevel5";
-        case OMX_VIDEO_HEVCHighTierLevel5:  return "HighTierLevel5";
-        case OMX_VIDEO_HEVCMainTierLevel51: return "MainTierLevel51";
-        case OMX_VIDEO_HEVCHighTierLevel51: return "HighTierLevel51";
-        case OMX_VIDEO_HEVCMainTierLevel52: return "MainTierLevel52";
-        case OMX_VIDEO_HEVCHighTierLevel52: return "HighTierLevel52";
-        case OMX_VIDEO_HEVCMainTierLevel6:  return "MainTierLevel6";
-        case OMX_VIDEO_HEVCHighTierLevel6:  return "HighTierLevel6";
-        case OMX_VIDEO_HEVCMainTierLevel61: return "MainTierLevel61";
-        case OMX_VIDEO_HEVCHighTierLevel61: return "HighTierLevel61";
-        case OMX_VIDEO_HEVCMainTierLevel62: return "MainTierLevel62";
-        case OMX_VIDEO_HEVCHighTierLevel62: return "HighTierLevel62";
-        default:                            return def;
-    }
-}
-
-inline static const char *asString(
-        OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE i, const char *def = "??") {
-    switch (i) {
-        case OMX_VIDEO_AndroidTemporalLayeringPatternNone:    return "None";
-        case OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC:  return "WebRTC";
-        case OMX_VIDEO_AndroidTemporalLayeringPatternAndroid: return "Android";
-        default:                                              return def;
-    }
-}
-
-#endif // AS_STRING_FOR_OMX_VIDEOEXT_H
-
-#endif // OMX_VideoExt_h
-
-#ifdef ANDROID
-} // namespace android
-#endif
diff --git a/include/media/openmax/OMX_Audio.h b/include/media/openmax/OMX_Audio.h
deleted file mode 100644
index 9c0296bf55..0000000000
--- a/include/media/openmax/OMX_Audio.h
+++ /dev/null
@@ -1,1343 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** @file OMX_Audio.h - OpenMax IL version 1.1.2
- *  The structures needed by Audio components to exchange
- *  parameters and configuration data with the componenmilts.
- */
-
-#ifndef OMX_Audio_h
-#define OMX_Audio_h
-
-#ifdef __cplusplus
-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_Core.h>
-
-/** @defgroup midi MIDI
- * @ingroup audio
- */
-
-/** @defgroup effects Audio effects
- * @ingroup audio
- */
-
-/** @defgroup audio OpenMAX IL Audio Domain
- * Structures for OpenMAX IL Audio domain
- * @{
- */
-
-/** Enumeration used to define the possible audio codings.
- *  If "OMX_AUDIO_CodingUnused" is selected, the coding selection must
- *  be done in a vendor specific way.  Since this is for an audio
- *  processing element this enum is relevant.  However, for another
- *  type of component other enums would be in this area.
- */
-typedef enum OMX_AUDIO_CODINGTYPE {
-    OMX_AUDIO_CodingUnused = 0,  /**< Placeholder value when coding is N/A  */
-    OMX_AUDIO_CodingAutoDetect,  /**< auto detection of audio format */
-    OMX_AUDIO_CodingPCM,         /**< Any variant of PCM coding */
-    OMX_AUDIO_CodingADPCM,       /**< Any variant of ADPCM encoded data */
-    OMX_AUDIO_CodingAMR,         /**< Any variant of AMR encoded data */
-    OMX_AUDIO_CodingGSMFR,       /**< Any variant of GSM fullrate (i.e. GSM610) */
-    OMX_AUDIO_CodingGSMEFR,      /**< Any variant of GSM Enhanced Fullrate encoded data*/
-    OMX_AUDIO_CodingGSMHR,       /**< Any variant of GSM Halfrate encoded data */
-    OMX_AUDIO_CodingPDCFR,       /**< Any variant of PDC Fullrate encoded data */
-    OMX_AUDIO_CodingPDCEFR,      /**< Any variant of PDC Enhanced Fullrate encoded data */
-    OMX_AUDIO_CodingPDCHR,       /**< Any variant of PDC Halfrate encoded data */
-    OMX_AUDIO_CodingTDMAFR,      /**< Any variant of TDMA Fullrate encoded data (TIA/EIA-136-420) */
-    OMX_AUDIO_CodingTDMAEFR,     /**< Any variant of TDMA Enhanced Fullrate encoded data (TIA/EIA-136-410) */
-    OMX_AUDIO_CodingQCELP8,      /**< Any variant of QCELP 8kbps encoded data */
-    OMX_AUDIO_CodingQCELP13,     /**< Any variant of QCELP 13kbps encoded data */
-    OMX_AUDIO_CodingEVRC,        /**< Any variant of EVRC encoded data */
-    OMX_AUDIO_CodingSMV,         /**< Any variant of SMV encoded data */
-    OMX_AUDIO_CodingG711,        /**< Any variant of G.711 encoded data */
-    OMX_AUDIO_CodingG723,        /**< Any variant of G.723 dot 1 encoded data */
-    OMX_AUDIO_CodingG726,        /**< Any variant of G.726 encoded data */
-    OMX_AUDIO_CodingG729,        /**< Any variant of G.729 encoded data */
-    OMX_AUDIO_CodingAAC,         /**< Any variant of AAC encoded data */
-    OMX_AUDIO_CodingMP3,         /**< Any variant of MP3 encoded data */
-    OMX_AUDIO_CodingSBC,         /**< Any variant of SBC encoded data */
-    OMX_AUDIO_CodingVORBIS,      /**< Any variant of VORBIS encoded data */
-    OMX_AUDIO_CodingWMA,         /**< Any variant of WMA encoded data */
-    OMX_AUDIO_CodingRA,          /**< Any variant of RA encoded data */
-    OMX_AUDIO_CodingMIDI,        /**< Any variant of MIDI encoded data */
-    OMX_AUDIO_CodingFLAC,        /**< Any variant of FLAC encoded data */
-    OMX_AUDIO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_CodingMax = 0x7FFFFFFF
-} OMX_AUDIO_CODINGTYPE;
-
-
-/** The PortDefinition structure is used to define all of the parameters
- *  necessary for the compliant component to setup an input or an output audio
- *  path.  If additional information is needed to define the parameters of the
- *  port (such as frequency), additional structures must be sent such as the
- *  OMX_AUDIO_PARAM_PCMMODETYPE structure to supply the extra parameters for the port.
- */
-typedef struct OMX_AUDIO_PORTDEFINITIONTYPE {
-    OMX_STRING cMIMEType;            /**< MIME type of data for the port */
-    OMX_NATIVE_DEVICETYPE pNativeRender; /** < platform specific reference
-                                               for an output device,
-                                               otherwise this field is 0 */
-    OMX_BOOL bFlagErrorConcealment;  /**< Turns on error concealment if it is
-                                          supported by the OMX component */
-    OMX_AUDIO_CODINGTYPE eEncoding;  /**< Type of data expected for this
-                                          port (e.g. PCM, AMR, MP3, etc) */
-} OMX_AUDIO_PORTDEFINITIONTYPE;
-
-
-/**  Port format parameter.  This structure is used to enumerate
-  *  the various data input/output format supported by the port.
-  */
-typedef struct OMX_AUDIO_PARAM_PORTFORMATTYPE {
-    OMX_U32 nSize;                  /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;       /**< OMX specification version information */
-    OMX_U32 nPortIndex;             /**< Indicates which port to set */
-    OMX_U32 nIndex;                 /**< Indicates the enumeration index for the format from 0x0 to N-1 */
-    OMX_AUDIO_CODINGTYPE eEncoding; /**< Type of data expected for this port (e.g. PCM, AMR, MP3, etc) */
-} OMX_AUDIO_PARAM_PORTFORMATTYPE;
-
-
-/** PCM mode type  */
-typedef enum OMX_AUDIO_PCMMODETYPE {
-    OMX_AUDIO_PCMModeLinear = 0,  /**< Linear PCM encoded data */
-    OMX_AUDIO_PCMModeALaw,        /**< A law PCM encoded data (G.711) */
-    OMX_AUDIO_PCMModeMULaw,       /**< Mu law PCM encoded data (G.711)  */
-    OMX_AUDIO_PCMModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_PCMModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_PCMModeMax = 0x7FFFFFFF
-} OMX_AUDIO_PCMMODETYPE;
-
-
-typedef enum OMX_AUDIO_CHANNELTYPE {
-    OMX_AUDIO_ChannelNone = 0x0,    /**< Unused or empty */
-    OMX_AUDIO_ChannelLF   = 0x1,    /**< Left front */
-    OMX_AUDIO_ChannelRF   = 0x2,    /**< Right front */
-    OMX_AUDIO_ChannelCF   = 0x3,    /**< Center front */
-    OMX_AUDIO_ChannelLS   = 0x4,    /**< Left surround */
-    OMX_AUDIO_ChannelRS   = 0x5,    /**< Right surround */
-    OMX_AUDIO_ChannelLFE  = 0x6,    /**< Low frequency effects */
-    OMX_AUDIO_ChannelCS   = 0x7,    /**< Back surround */
-    OMX_AUDIO_ChannelLR   = 0x8,    /**< Left rear. */
-    OMX_AUDIO_ChannelRR   = 0x9,    /**< Right rear. */
-    OMX_AUDIO_ChannelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_ChannelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_ChannelMax  = 0x7FFFFFFF
-} OMX_AUDIO_CHANNELTYPE;
-
-#define OMX_AUDIO_MAXCHANNELS 16  /**< maximum number distinct audio channels that a buffer may contain */
-#define OMX_MIN_PCMPAYLOAD_MSEC 5 /**< Minimum audio buffer payload size for uncompressed (PCM) audio */
-
-/** PCM format description */
-typedef struct OMX_AUDIO_PARAM_PCMMODETYPE {
-    OMX_U32 nSize;                    /**< Size of this structure, in Bytes */
-    OMX_VERSIONTYPE nVersion;         /**< OMX specification version information */
-    OMX_U32 nPortIndex;               /**< port that this structure applies to */
-    OMX_U32 nChannels;                /**< Number of channels (e.g. 2 for stereo) */
-    OMX_NUMERICALDATATYPE eNumData;   /**< indicates PCM data as signed, unsigned or floating pt. */
-    OMX_ENDIANTYPE eEndian;           /**< indicates PCM data as little or big endian */
-    OMX_BOOL bInterleaved;            /**< True for normal interleaved data; false for
-                                           non-interleaved data (e.g. block data) */
-    OMX_U32 nBitPerSample;            /**< Bit per sample */
-    OMX_U32 nSamplingRate;            /**< Sampling rate of the source data.  Use 0 for
-                                           variable or unknown sampling rate. */
-    OMX_AUDIO_PCMMODETYPE ePCMMode;   /**< PCM mode enumeration */
-    OMX_AUDIO_CHANNELTYPE eChannelMapping[OMX_AUDIO_MAXCHANNELS]; /**< Slot i contains channel defined by eChannelMap[i] */
-
-} OMX_AUDIO_PARAM_PCMMODETYPE;
-
-
-/** Audio channel mode.  This is used by both AAC and MP3, although the names are more appropriate
- * for the MP3.  For example, JointStereo for MP3 is CouplingChannels for AAC.
- */
-typedef enum OMX_AUDIO_CHANNELMODETYPE {
-    OMX_AUDIO_ChannelModeStereo = 0,  /**< 2 channels, the bitrate allocation between those
-                                          two channels changes accordingly to each channel information */
-    OMX_AUDIO_ChannelModeJointStereo, /**< mode that takes advantage of what is common between
-                                           2 channels for higher compression gain */
-    OMX_AUDIO_ChannelModeDual,        /**< 2 mono-channels, each channel is encoded with half
-                                           the bitrate of the overall bitrate */
-    OMX_AUDIO_ChannelModeMono,        /**< Mono channel mode */
-    OMX_AUDIO_ChannelModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_ChannelModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_ChannelModeMax = 0x7FFFFFFF
-} OMX_AUDIO_CHANNELMODETYPE;
-
-
-typedef enum OMX_AUDIO_MP3STREAMFORMATTYPE {
-    OMX_AUDIO_MP3StreamFormatMP1Layer3 = 0, /**< MP3 Audio MPEG 1 Layer 3 Stream format */
-    OMX_AUDIO_MP3StreamFormatMP2Layer3,     /**< MP3 Audio MPEG 2 Layer 3 Stream format */
-    OMX_AUDIO_MP3StreamFormatMP2_5Layer3,   /**< MP3 Audio MPEG2.5 Layer 3 Stream format */
-    OMX_AUDIO_MP3StreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_MP3StreamFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_MP3StreamFormatMax = 0x7FFFFFFF
-} OMX_AUDIO_MP3STREAMFORMATTYPE;
-
-/** MP3 params */
-typedef struct OMX_AUDIO_PARAM_MP3TYPE {
-    OMX_U32 nSize;                 /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;      /**< OMX specification version information */
-    OMX_U32 nPortIndex;            /**< port that this structure applies to */
-    OMX_U32 nChannels;             /**< Number of channels */
-    OMX_U32 nBitRate;              /**< Bit rate of the input data.  Use 0 for variable
-                                        rate or unknown bit rates */
-    OMX_U32 nSampleRate;           /**< Sampling rate of the source data.  Use 0 for
-                                        variable or unknown sampling rate. */
-    OMX_U32 nAudioBandWidth;       /**< Audio band width (in Hz) to which an encoder should
-                                        limit the audio signal. Use 0 to let encoder decide */
-    OMX_AUDIO_CHANNELMODETYPE eChannelMode;   /**< Channel mode enumeration */
-    OMX_AUDIO_MP3STREAMFORMATTYPE eFormat;  /**< MP3 stream format */
-} OMX_AUDIO_PARAM_MP3TYPE;
-
-
-typedef enum OMX_AUDIO_AACSTREAMFORMATTYPE {
-    OMX_AUDIO_AACStreamFormatMP2ADTS = 0, /**< AAC Audio Data Transport Stream 2 format */
-    OMX_AUDIO_AACStreamFormatMP4ADTS,     /**< AAC Audio Data Transport Stream 4 format */
-    OMX_AUDIO_AACStreamFormatMP4LOAS,     /**< AAC Low Overhead Audio Stream format */
-    OMX_AUDIO_AACStreamFormatMP4LATM,     /**< AAC Low overhead Audio Transport Multiplex */
-    OMX_AUDIO_AACStreamFormatADIF,        /**< AAC Audio Data Interchange Format */
-    OMX_AUDIO_AACStreamFormatMP4FF,       /**< AAC inside MPEG-4/ISO File Format */
-    OMX_AUDIO_AACStreamFormatRAW,         /**< AAC Raw Format */
-    OMX_AUDIO_AACStreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_AACStreamFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_AACStreamFormatMax = 0x7FFFFFFF
-} OMX_AUDIO_AACSTREAMFORMATTYPE;
-
-
-/** AAC mode type.  Note that the term profile is used with the MPEG-2
- * standard and the term object type and profile is used with MPEG-4 */
-typedef enum OMX_AUDIO_AACPROFILETYPE{
-  OMX_AUDIO_AACObjectNull = 0,      /**< Null, not used */
-  OMX_AUDIO_AACObjectMain = 1,      /**< AAC Main object */
-  OMX_AUDIO_AACObjectLC,            /**< AAC Low Complexity object (AAC profile) */
-  OMX_AUDIO_AACObjectSSR,           /**< AAC Scalable Sample Rate object */
-  OMX_AUDIO_AACObjectLTP,           /**< AAC Long Term Prediction object */
-  OMX_AUDIO_AACObjectHE,            /**< AAC High Efficiency (object type SBR, HE-AAC profile) */
-  OMX_AUDIO_AACObjectScalable,      /**< AAC Scalable object */
-  OMX_AUDIO_AACObjectERLC = 17,     /**< ER AAC Low Complexity object (Error Resilient AAC-LC) */
-  OMX_AUDIO_AACObjectER_Scalable = 20, /**< ER AAC scalable object */
-  OMX_AUDIO_AACObjectLD = 23,       /**< AAC Low Delay object (Error Resilient) */
-  OMX_AUDIO_AACObjectHE_PS = 29,    /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */
-  OMX_AUDIO_AACObjectELD = 39,      /** AAC Enhanced Low Delay. NOTE: Pending Khronos standardization **/
-  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-  OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-  OMX_AUDIO_AACObjectMax = 0x7FFFFFFF
-} OMX_AUDIO_AACPROFILETYPE;
-
-
-/** AAC tool usage (for nAACtools in OMX_AUDIO_PARAM_AACPROFILETYPE).
- * Required for encoder configuration and optional as decoder info output.
- * For MP3, OMX_AUDIO_CHANNELMODETYPE is sufficient. */
-#define OMX_AUDIO_AACToolNone 0x00000000 /**< no AAC tools allowed (encoder config) or active (decoder info output) */
-#define OMX_AUDIO_AACToolMS   0x00000001 /**< MS: Mid/side joint coding tool allowed or active */
-#define OMX_AUDIO_AACToolIS   0x00000002 /**< IS: Intensity stereo tool allowed or active */
-#define OMX_AUDIO_AACToolTNS  0x00000004 /**< TNS: Temporal Noise Shaping tool allowed or active */
-#define OMX_AUDIO_AACToolPNS  0x00000008 /**< PNS: MPEG-4 Perceptual Noise substitution tool allowed or active */
-#define OMX_AUDIO_AACToolLTP  0x00000010 /**< LTP: MPEG-4 Long Term Prediction tool allowed or active */
-#define OMX_AUDIO_AACToolVendor 0x00010000 /**< NOT A KHRONOS VALUE, offset for vendor-specific additions */
-#define OMX_AUDIO_AACToolAll  0x7FFFFFFF /**< all AAC tools allowed or active (*/
-
-/** MPEG-4 AAC error resilience (ER) tool usage (for nAACERtools in OMX_AUDIO_PARAM_AACPROFILETYPE).
- * Required for ER encoder configuration and optional as decoder info output */
-#define OMX_AUDIO_AACERNone  0x00000000  /**< no AAC ER tools allowed/used */
-#define OMX_AUDIO_AACERVCB11 0x00000001  /**< VCB11: Virtual Code Books for AAC section data */
-#define OMX_AUDIO_AACERRVLC  0x00000002  /**< RVLC: Reversible Variable Length Coding */
-#define OMX_AUDIO_AACERHCR   0x00000004  /**< HCR: Huffman Codeword Reordering */
-#define OMX_AUDIO_AACERAll   0x7FFFFFFF  /**< all AAC ER tools allowed/used */
-
-
-/** AAC params */
-typedef struct OMX_AUDIO_PARAM_AACPROFILETYPE {
-    OMX_U32 nSize;                 /**< Size of this structure, in Bytes */
-    OMX_VERSIONTYPE nVersion;      /**< OMX specification version information */
-    OMX_U32 nPortIndex;            /**< Port that this structure applies to */
-    OMX_U32 nChannels;             /**< Number of channels */
-    OMX_U32 nSampleRate;           /**< Sampling rate of the source data.  Use 0 for
-                                        variable or unknown sampling rate. */
-    OMX_U32 nBitRate;              /**< Bit rate of the input data.  Use 0 for variable
-                                        rate or unknown bit rates */
-    OMX_U32 nAudioBandWidth;       /**< Audio band width (in Hz) to which an encoder should
-                                        limit the audio signal. Use 0 to let encoder decide */
-    OMX_U32 nFrameLength;          /**< Frame length (in audio samples per channel) of the codec.
-                                        Can be 1024 or 960 (AAC-LC), 2048 (HE-AAC), 480 or 512 (AAC-LD).
-                                        Use 0 to let encoder decide */
-    OMX_U32 nAACtools;             /**< AAC tool usage */
-    OMX_U32 nAACERtools;           /**< MPEG-4 AAC error resilience tool usage */
-    OMX_AUDIO_AACPROFILETYPE eAACProfile;   /**< AAC profile enumeration */
-    OMX_AUDIO_AACSTREAMFORMATTYPE eAACStreamFormat; /**< AAC stream format enumeration */
-    OMX_AUDIO_CHANNELMODETYPE eChannelMode;   /**< Channel mode enumeration */
-} OMX_AUDIO_PARAM_AACPROFILETYPE;
-
-
-/** VORBIS params */
-typedef struct OMX_AUDIO_PARAM_VORBISTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U32 nChannels;        /**< Number of channels */
-    OMX_U32 nBitRate;         /**< Bit rate of the encoded data data.  Use 0 for variable
-                                   rate or unknown bit rates. Encoding is set to the
-                                   bitrate closest to specified  value (in bps) */
-    OMX_U32 nMinBitRate;      /**< Sets minimum bitrate (in bps). */
-    OMX_U32 nMaxBitRate;      /**< Sets maximum bitrate (in bps). */
-
-    OMX_U32 nSampleRate;      /**< Sampling rate of the source data.  Use 0 for
-                                   variable or unknown sampling rate. */
-    OMX_U32 nAudioBandWidth;  /**< Audio band width (in Hz) to which an encoder should
-                                   limit the audio signal. Use 0 to let encoder decide */
-    OMX_S32 nQuality;         /**< Sets encoding quality to n, between -1 (low) and 10 (high).
-                                   In the default mode of operation, teh quality level is 3.
-                                   Normal quality range is 0 - 10. */
-    OMX_BOOL bManaged;        /**< Set  bitrate  management  mode. This turns off the
-                                   normal VBR encoding, but allows hard or soft bitrate
-                                   constraints to be enforced by the encoder. This mode can
-                                   be slower, and may also be lower quality. It is
-                                   primarily useful for streaming. */
-    OMX_BOOL bDownmix;        /**< Downmix input from stereo to mono (has no effect on
-                                   non-stereo streams). Useful for lower-bitrate encoding. */
-} OMX_AUDIO_PARAM_VORBISTYPE;
-
-
-/** FLAC params */
-typedef struct OMX_AUDIO_PARAM_FLACTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U32 nChannels;        /**< Number of channels */
-    OMX_U32 nSampleRate;      /**< Sampling rate of the source data.  Use 0 for
-                                   unknown sampling rate. */
-    OMX_U32 nCompressionLevel;/**< FLAC compression level, from 0 (fastest compression)
-                                   to 8 (highest compression */
-} OMX_AUDIO_PARAM_FLACTYPE;
-
-
-/** WMA Version */
-typedef enum OMX_AUDIO_WMAFORMATTYPE {
-  OMX_AUDIO_WMAFormatUnused = 0, /**< format unused or unknown */
-  OMX_AUDIO_WMAFormat7,          /**< Windows Media Audio format 7 */
-  OMX_AUDIO_WMAFormat8,          /**< Windows Media Audio format 8 */
-  OMX_AUDIO_WMAFormat9,          /**< Windows Media Audio format 9 */
-  OMX_AUDIO_WMAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-  OMX_AUDIO_WMAFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-  OMX_AUDIO_WMAFormatMax = 0x7FFFFFFF
-} OMX_AUDIO_WMAFORMATTYPE;
-
-
-/** WMA Profile */
-typedef enum OMX_AUDIO_WMAPROFILETYPE {
-  OMX_AUDIO_WMAProfileUnused = 0,  /**< profile unused or unknown */
-  OMX_AUDIO_WMAProfileL1,          /**< Windows Media audio version 9 profile L1 */
-  OMX_AUDIO_WMAProfileL2,          /**< Windows Media audio version 9 profile L2 */
-  OMX_AUDIO_WMAProfileL3,          /**< Windows Media audio version 9 profile L3 */
-  OMX_AUDIO_WMAProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-  OMX_AUDIO_WMAProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-  OMX_AUDIO_WMAProfileMax = 0x7FFFFFFF
-} OMX_AUDIO_WMAPROFILETYPE;
-
-
-/** WMA params */
-typedef struct OMX_AUDIO_PARAM_WMATYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U16 nChannels;        /**< Number of channels */
-    OMX_U32 nBitRate;         /**< Bit rate of the input data.  Use 0 for variable
-                                   rate or unknown bit rates */
-    OMX_AUDIO_WMAFORMATTYPE eFormat; /**< Version of WMA stream / data */
-    OMX_AUDIO_WMAPROFILETYPE eProfile;  /**< Profile of WMA stream / data */
-    OMX_U32 nSamplingRate;    /**< Sampling rate of the source data */
-    OMX_U16 nBlockAlign;      /**< is the block alignment, or block size, in bytes of the audio codec */
-    OMX_U16 nEncodeOptions;   /**< WMA Type-specific data */
-    OMX_U32 nSuperBlockAlign; /**< WMA Type-specific data */
-} OMX_AUDIO_PARAM_WMATYPE;
-
-/**
- * RealAudio format
- */
-typedef enum OMX_AUDIO_RAFORMATTYPE {
-    OMX_AUDIO_RAFormatUnused = 0, /**< Format unused or unknown */
-    OMX_AUDIO_RA8,                /**< RealAudio 8 codec */
-    OMX_AUDIO_RA9,                /**< RealAudio 9 codec */
-    OMX_AUDIO_RA10_AAC,           /**< MPEG-4 AAC codec for bitrates of more than 128kbps */
-    OMX_AUDIO_RA10_CODEC,         /**< RealAudio codec for bitrates less than 128 kbps */
-    OMX_AUDIO_RA10_LOSSLESS,      /**< RealAudio Lossless */
-    OMX_AUDIO_RA10_MULTICHANNEL,  /**< RealAudio Multichannel */
-    OMX_AUDIO_RA10_VOICE,         /**< RealAudio Voice for bitrates below 15 kbps */
-    OMX_AUDIO_RAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_RAFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_RAFormatMax = 0x7FFFFFFF
-} OMX_AUDIO_RAFORMATTYPE;
-
-/** RA (Real Audio) params */
-typedef struct OMX_AUDIO_PARAM_RATYPE {
-    OMX_U32 nSize;              /**< Size of this structure, in Bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< Port that this structure applies to */
-    OMX_U32 nChannels;          /**< Number of channels */
-    OMX_U32 nSamplingRate;      /**< is the sampling rate of the source data */
-    OMX_U32 nBitsPerFrame;      /**< is the value for bits per frame  */
-    OMX_U32 nSamplePerFrame;    /**< is the value for samples per frame */
-    OMX_U32 nCouplingQuantBits; /**< is the number of coupling quantization bits in the stream */
-    OMX_U32 nCouplingStartRegion;   /**< is the coupling start region in the stream  */
-    OMX_U32 nNumRegions;        /**< is the number of regions value */
-    OMX_AUDIO_RAFORMATTYPE eFormat; /**< is the RealAudio audio format */
-} OMX_AUDIO_PARAM_RATYPE;
-
-
-/** SBC Allocation Method Type */
-typedef enum OMX_AUDIO_SBCALLOCMETHODTYPE {
-  OMX_AUDIO_SBCAllocMethodLoudness, /**< Loudness allocation method */
-  OMX_AUDIO_SBCAllocMethodSNR,      /**< SNR allocation method */
-  OMX_AUDIO_SBCAllocMethodKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-  OMX_AUDIO_SBCAllocMethodVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-  OMX_AUDIO_SBCAllocMethodMax = 0x7FFFFFFF
-} OMX_AUDIO_SBCALLOCMETHODTYPE;
-
-
-/** SBC params */
-typedef struct OMX_AUDIO_PARAM_SBCTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_U32 nChannels;         /**< Number of channels */
-    OMX_U32 nBitRate;          /**< Bit rate of the input data.  Use 0 for variable
-                                    rate or unknown bit rates */
-    OMX_U32 nSampleRate;       /**< Sampling rate of the source data.  Use 0 for
-                                    variable or unknown sampling rate. */
-    OMX_U32 nBlocks;           /**< Number of blocks */
-    OMX_U32 nSubbands;         /**< Number of subbands */
-    OMX_U32 nBitPool;          /**< Bitpool value */
-    OMX_BOOL bEnableBitrate;   /**< Use bitrate value instead of bitpool */
-    OMX_AUDIO_CHANNELMODETYPE eChannelMode; /**< Channel mode enumeration */
-    OMX_AUDIO_SBCALLOCMETHODTYPE eSBCAllocType;   /**< SBC Allocation method type */
-} OMX_AUDIO_PARAM_SBCTYPE;
-
-
-/** ADPCM stream format parameters */
-typedef struct OMX_AUDIO_PARAM_ADPCMTYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< port that this structure applies to */
-    OMX_U32 nChannels;          /**< Number of channels in the data stream (not
-                                     necessarily the same as the number of channels
-                                     to be rendered. */
-    OMX_U32 nBitsPerSample;     /**< Number of bits in each sample */
-    OMX_U32 nSampleRate;        /**< Sampling rate of the source data.  Use 0 for
-                                    variable or unknown sampling rate. */
-} OMX_AUDIO_PARAM_ADPCMTYPE;
-
-
-/** G723 rate */
-typedef enum OMX_AUDIO_G723RATE {
-    OMX_AUDIO_G723ModeUnused = 0,  /**< AMRNB Mode unused / unknown */
-    OMX_AUDIO_G723ModeLow,         /**< 5300 bps */
-    OMX_AUDIO_G723ModeHigh,        /**< 6300 bps */
-    OMX_AUDIO_G723ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_G723ModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_G723ModeMax = 0x7FFFFFFF
-} OMX_AUDIO_G723RATE;
-
-
-/** G723 - Sample rate must be 8 KHz */
-typedef struct OMX_AUDIO_PARAM_G723TYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_BOOL bDTX;                /**< Enable Discontinuous Transmisssion */
-    OMX_AUDIO_G723RATE eBitRate;  /**< todo: Should this be moved to a config? */
-    OMX_BOOL bHiPassFilter;       /**< Enable High Pass Filter */
-    OMX_BOOL bPostFilter;         /**< Enable Post Filter */
-} OMX_AUDIO_PARAM_G723TYPE;
-
-
-/** ITU G726 (ADPCM) rate */
-typedef enum OMX_AUDIO_G726MODE {
-    OMX_AUDIO_G726ModeUnused = 0,  /**< G726 Mode unused / unknown */
-    OMX_AUDIO_G726Mode16,          /**< 16 kbps */
-    OMX_AUDIO_G726Mode24,          /**< 24 kbps */
-    OMX_AUDIO_G726Mode32,          /**< 32 kbps, most common rate, also G721 */
-    OMX_AUDIO_G726Mode40,          /**< 40 kbps */
-    OMX_AUDIO_G726ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_G726ModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_G726ModeMax = 0x7FFFFFFF
-} OMX_AUDIO_G726MODE;
-
-
-/** G.726 stream format parameters - must be at 8KHz */
-typedef struct OMX_AUDIO_PARAM_G726TYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< port that this structure applies to */
-    OMX_U32 nChannels;          /**< Number of channels in the data stream (not
-                                     necessarily the same as the number of channels
-                                     to be rendered. */
-     OMX_AUDIO_G726MODE eG726Mode;
-} OMX_AUDIO_PARAM_G726TYPE;
-
-
-/** G729 coder type */
-typedef enum OMX_AUDIO_G729TYPE {
-    OMX_AUDIO_G729 = 0,           /**< ITU G.729  encoded data */
-    OMX_AUDIO_G729A,              /**< ITU G.729 annex A  encoded data */
-    OMX_AUDIO_G729B,              /**< ITU G.729 with annex B encoded data */
-    OMX_AUDIO_G729AB,             /**< ITU G.729 annexes A and B encoded data */
-    OMX_AUDIO_G729KhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_G729VendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_G729Max = 0x7FFFFFFF
-} OMX_AUDIO_G729TYPE;
-
-
-/** G729 stream format parameters - fixed 6KHz sample rate */
-typedef struct OMX_AUDIO_PARAM_G729TYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U32 nChannels;        /**< Number of channels in the data stream (not
-                                   necessarily the same as the number of channels
-                                   to be rendered. */
-    OMX_BOOL bDTX;            /**< Enable Discontinuous Transmisssion */
-    OMX_AUDIO_G729TYPE eBitType;
-} OMX_AUDIO_PARAM_G729TYPE;
-
-
-/** AMR Frame format */
-typedef enum OMX_AUDIO_AMRFRAMEFORMATTYPE {
-    OMX_AUDIO_AMRFrameFormatConformance = 0,  /**< Frame Format is AMR Conformance
-                                                   (Standard) Format */
-    OMX_AUDIO_AMRFrameFormatIF1,              /**< Frame Format is AMR Interface
-                                                   Format 1 */
-    OMX_AUDIO_AMRFrameFormatIF2,              /**< Frame Format is AMR Interface
-                                                   Format 2*/
-    OMX_AUDIO_AMRFrameFormatFSF,              /**< Frame Format is AMR File Storage
-                                                   Format */
-    OMX_AUDIO_AMRFrameFormatRTPPayload,       /**< Frame Format is AMR Real-Time
-                                                   Transport Protocol Payload Format */
-    OMX_AUDIO_AMRFrameFormatITU,              /**< Frame Format is ITU Format (added at Motorola request) */
-    OMX_AUDIO_AMRFrameFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_AMRFrameFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_AMRFrameFormatMax = 0x7FFFFFFF
-} OMX_AUDIO_AMRFRAMEFORMATTYPE;
-
-
-/** AMR band mode */
-typedef enum OMX_AUDIO_AMRBANDMODETYPE {
-    OMX_AUDIO_AMRBandModeUnused = 0,          /**< AMRNB Mode unused / unknown */
-    OMX_AUDIO_AMRBandModeNB0,                 /**< AMRNB Mode 0 =  4750 bps */
-    OMX_AUDIO_AMRBandModeNB1,                 /**< AMRNB Mode 1 =  5150 bps */
-    OMX_AUDIO_AMRBandModeNB2,                 /**< AMRNB Mode 2 =  5900 bps */
-    OMX_AUDIO_AMRBandModeNB3,                 /**< AMRNB Mode 3 =  6700 bps */
-    OMX_AUDIO_AMRBandModeNB4,                 /**< AMRNB Mode 4 =  7400 bps */
-    OMX_AUDIO_AMRBandModeNB5,                 /**< AMRNB Mode 5 =  7950 bps */
-    OMX_AUDIO_AMRBandModeNB6,                 /**< AMRNB Mode 6 = 10200 bps */
-    OMX_AUDIO_AMRBandModeNB7,                 /**< AMRNB Mode 7 = 12200 bps */
-    OMX_AUDIO_AMRBandModeWB0,                 /**< AMRWB Mode 0 =  6600 bps */
-    OMX_AUDIO_AMRBandModeWB1,                 /**< AMRWB Mode 1 =  8850 bps */
-    OMX_AUDIO_AMRBandModeWB2,                 /**< AMRWB Mode 2 = 12650 bps */
-    OMX_AUDIO_AMRBandModeWB3,                 /**< AMRWB Mode 3 = 14250 bps */
-    OMX_AUDIO_AMRBandModeWB4,                 /**< AMRWB Mode 4 = 15850 bps */
-    OMX_AUDIO_AMRBandModeWB5,                 /**< AMRWB Mode 5 = 18250 bps */
-    OMX_AUDIO_AMRBandModeWB6,                 /**< AMRWB Mode 6 = 19850 bps */
-    OMX_AUDIO_AMRBandModeWB7,                 /**< AMRWB Mode 7 = 23050 bps */
-    OMX_AUDIO_AMRBandModeWB8,                 /**< AMRWB Mode 8 = 23850 bps */
-    OMX_AUDIO_AMRBandModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_AMRBandModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_AMRBandModeMax = 0x7FFFFFFF
-} OMX_AUDIO_AMRBANDMODETYPE;
-
-
-/** AMR Discontinuous Transmission mode */
-typedef enum OMX_AUDIO_AMRDTXMODETYPE {
-    OMX_AUDIO_AMRDTXModeOff = 0,        /**< AMR Discontinuous Transmission Mode is disabled */
-    OMX_AUDIO_AMRDTXModeOnVAD1,         /**< AMR Discontinuous Transmission Mode using
-                                             Voice Activity Detector 1 (VAD1) is enabled */
-    OMX_AUDIO_AMRDTXModeOnVAD2,         /**< AMR Discontinuous Transmission Mode using
-                                             Voice Activity Detector 2 (VAD2) is enabled */
-    OMX_AUDIO_AMRDTXModeOnAuto,         /**< The codec will automatically select between
-                                             Off, VAD1 or VAD2 modes */
-
-    OMX_AUDIO_AMRDTXasEFR,             /**< DTX as EFR instead of AMR standard (3GPP 26.101, frame type =8,9,10) */
-
-    OMX_AUDIO_AMRDTXModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_AMRDTXModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_AMRDTXModeMax = 0x7FFFFFFF
-} OMX_AUDIO_AMRDTXMODETYPE;
-
-
-/** AMR params */
-typedef struct OMX_AUDIO_PARAM_AMRTYPE {
-    OMX_U32 nSize;                          /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;               /**< OMX specification version information */
-    OMX_U32 nPortIndex;                     /**< port that this structure applies to */
-    OMX_U32 nChannels;                      /**< Number of channels */
-    OMX_U32 nBitRate;                       /**< Bit rate read only field */
-    OMX_AUDIO_AMRBANDMODETYPE eAMRBandMode; /**< AMR Band Mode enumeration */
-    OMX_AUDIO_AMRDTXMODETYPE  eAMRDTXMode;  /**< AMR DTX Mode enumeration */
-    OMX_AUDIO_AMRFRAMEFORMATTYPE eAMRFrameFormat; /**< AMR frame format enumeration */
-} OMX_AUDIO_PARAM_AMRTYPE;
-
-
-/** GSM_FR (ETSI 06.10, 3GPP 46.010) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_GSMFRTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_BOOL bDTX;            /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;   /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_GSMFRTYPE;
-
-
-/** GSM-HR (ETSI 06.20, 3GPP 46.020) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_GSMHRTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_BOOL bDTX;            /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;   /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_GSMHRTYPE;
-
-
-/** GSM-EFR (ETSI 06.60, 3GPP 46.060) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_GSMEFRTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_BOOL bDTX;            /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;   /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_GSMEFRTYPE;
-
-
-/** TDMA FR (TIA/EIA-136-420, VSELP 7.95kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_TDMAFRTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_BOOL bDTX;                /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;       /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_TDMAFRTYPE;
-
-
-/** TDMA EFR (TIA/EIA-136-410, ACELP 7.4kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_TDMAEFRTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_BOOL bDTX;                /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;       /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_TDMAEFRTYPE;
-
-
-/** PDC FR ( RCR-27, VSELP 6.7kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_PDCFRTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_BOOL bDTX;                /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;       /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_PDCFRTYPE;
-
-
-/** PDC EFR ( RCR-27, ACELP 6.7kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_PDCEFRTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_BOOL bDTX;                /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;       /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_PDCEFRTYPE;
-
-/** PDC HR ( RCR-27, PSI-CELP 3.45kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_PDCHRTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_BOOL bDTX;                /**< Enable Discontinuous Transmisssion */
-    OMX_BOOL bHiPassFilter;       /**< Enable High Pass Filter */
-} OMX_AUDIO_PARAM_PDCHRTYPE;
-
-
-/** CDMA Rate types */
-typedef enum OMX_AUDIO_CDMARATETYPE {
-    OMX_AUDIO_CDMARateBlank = 0,          /**< CDMA encoded frame is blank */
-    OMX_AUDIO_CDMARateFull,               /**< CDMA encoded frame in full rate */
-    OMX_AUDIO_CDMARateHalf,               /**< CDMA encoded frame in half rate */
-    OMX_AUDIO_CDMARateQuarter,            /**< CDMA encoded frame in quarter rate */
-    OMX_AUDIO_CDMARateEighth,             /**< CDMA encoded frame in eighth rate (DTX)*/
-    OMX_AUDIO_CDMARateErasure,            /**< CDMA erasure frame */
-    OMX_AUDIO_CDMARateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_CDMARateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_CDMARateMax = 0x7FFFFFFF
-} OMX_AUDIO_CDMARATETYPE;
-
-
-/** QCELP8 (TIA/EIA-96, up to 8kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_QCELP8TYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_U32 nBitRate;             /**< Bit rate of the input data.  Use 0 for variable
-                                       rate or unknown bit rates */
-    OMX_AUDIO_CDMARATETYPE eCDMARate; /**< Frame rate */
-    OMX_U32 nMinBitRate;          /**< minmal rate for the encoder = 1,2,3,4, default = 1 */
-    OMX_U32 nMaxBitRate;          /**< maximal rate for the encoder = 1,2,3,4, default = 4 */
-} OMX_AUDIO_PARAM_QCELP8TYPE;
-
-
-/** QCELP13 ( CDMA, EIA/TIA-733, 13.3kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_QCELP13TYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_AUDIO_CDMARATETYPE eCDMARate; /**< Frame rate */
-    OMX_U32 nMinBitRate;          /**< minmal rate for the encoder = 1,2,3,4, default = 1 */
-    OMX_U32 nMaxBitRate;          /**< maximal rate for the encoder = 1,2,3,4, default = 4 */
-} OMX_AUDIO_PARAM_QCELP13TYPE;
-
-
-/** EVRC ( CDMA, EIA/TIA-127, RCELP up to 8.55kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_EVRCTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_AUDIO_CDMARATETYPE eCDMARate; /**< actual Frame rate */
-    OMX_BOOL bRATE_REDUCon;       /**< RATE_REDUCtion is requested for this frame */
-    OMX_U32 nMinBitRate;          /**< minmal rate for the encoder = 1,2,3,4, default = 1 */
-    OMX_U32 nMaxBitRate;          /**< maximal rate for the encoder = 1,2,3,4, default = 4 */
-    OMX_BOOL bHiPassFilter;       /**< Enable encoder's High Pass Filter */
-    OMX_BOOL bNoiseSuppressor;    /**< Enable encoder's noise suppressor pre-processing */
-    OMX_BOOL bPostFilter;         /**< Enable decoder's post Filter */
-} OMX_AUDIO_PARAM_EVRCTYPE;
-
-
-/** SMV ( up to 8.55kbps coder) stream format parameters */
-typedef struct OMX_AUDIO_PARAM_SMVTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_U32 nChannels;            /**< Number of channels in the data stream (not
-                                       necessarily the same as the number of channels
-                                       to be rendered. */
-    OMX_AUDIO_CDMARATETYPE eCDMARate; /**< Frame rate */
-    OMX_BOOL bRATE_REDUCon;           /**< RATE_REDUCtion is requested for this frame */
-    OMX_U32 nMinBitRate;          /**< minmal rate for the encoder = 1,2,3,4, default = 1 ??*/
-    OMX_U32 nMaxBitRate;          /**< maximal rate for the encoder = 1,2,3,4, default = 4 ??*/
-    OMX_BOOL bHiPassFilter;       /**< Enable encoder's High Pass Filter ??*/
-    OMX_BOOL bNoiseSuppressor;    /**< Enable encoder's noise suppressor pre-processing */
-    OMX_BOOL bPostFilter;         /**< Enable decoder's post Filter ??*/
-} OMX_AUDIO_PARAM_SMVTYPE;
-
-
-/** MIDI Format
- * @ingroup midi
- */
-typedef enum OMX_AUDIO_MIDIFORMATTYPE
-{
-    OMX_AUDIO_MIDIFormatUnknown = 0, /**< MIDI Format unknown or don't care */
-    OMX_AUDIO_MIDIFormatSMF0,        /**< Standard MIDI File Type 0 */
-    OMX_AUDIO_MIDIFormatSMF1,        /**< Standard MIDI File Type 1 */
-    OMX_AUDIO_MIDIFormatSMF2,        /**< Standard MIDI File Type 2 */
-    OMX_AUDIO_MIDIFormatSPMIDI,      /**< SP-MIDI */
-    OMX_AUDIO_MIDIFormatXMF0,        /**< eXtensible Music Format type 0 */
-    OMX_AUDIO_MIDIFormatXMF1,        /**< eXtensible Music Format type 1 */
-    OMX_AUDIO_MIDIFormatMobileXMF,   /**< Mobile XMF (eXtensible Music Format type 2) */
-    OMX_AUDIO_MIDIFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_MIDIFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_MIDIFormatMax = 0x7FFFFFFF
-} OMX_AUDIO_MIDIFORMATTYPE;
-
-
-/** MIDI params
- * @ingroup midi
- */
-typedef struct OMX_AUDIO_PARAM_MIDITYPE {
-    OMX_U32 nSize;                 /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;      /**< OMX specification version information */
-    OMX_U32 nPortIndex;            /**< port that this structure applies to */
-    OMX_U32 nFileSize;             /**< size of the MIDI file in bytes, where the entire
-                                        MIDI file passed in, otherwise if 0x0, the MIDI data
-                                        is merged and streamed (instead of passed as an
-                                        entire MIDI file) */
-    OMX_BU32 sMaxPolyphony;        /**< Specifies the maximum simultaneous polyphonic
-                                        voices. A value of zero indicates that the default
-                                        polyphony of the device is used  */
-    OMX_BOOL bLoadDefaultSound;    /**< Whether to load default sound
-                                        bank at initialization */
-    OMX_AUDIO_MIDIFORMATTYPE eMidiFormat; /**< Version of the MIDI file */
-} OMX_AUDIO_PARAM_MIDITYPE;
-
-
-/** Type of the MIDI sound bank
- * @ingroup midi
- */
-typedef enum OMX_AUDIO_MIDISOUNDBANKTYPE {
-    OMX_AUDIO_MIDISoundBankUnused = 0,           /**< unused/unknown soundbank type */
-    OMX_AUDIO_MIDISoundBankDLS1,                 /**< DLS version 1 */
-    OMX_AUDIO_MIDISoundBankDLS2,                 /**< DLS version 2 */
-    OMX_AUDIO_MIDISoundBankMobileDLSBase,        /**< Mobile DLS, using the base functionality */
-    OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions, /**< Mobile DLS, using the specification-defined optional feature set */
-    OMX_AUDIO_MIDISoundBankKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_MIDISoundBankVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_MIDISoundBankMax = 0x7FFFFFFF
-} OMX_AUDIO_MIDISOUNDBANKTYPE;
-
-
-/** Bank Layout describes how bank MSB & LSB are used in the DLS instrument definitions sound bank
- * @ingroup midi
- */
-typedef enum OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE {
-   OMX_AUDIO_MIDISoundBankLayoutUnused = 0,   /**< unused/unknown soundbank type */
-   OMX_AUDIO_MIDISoundBankLayoutGM,           /**< GS layout (based on bank MSB 0x00) */
-   OMX_AUDIO_MIDISoundBankLayoutGM2,          /**< General MIDI 2 layout (using MSB 0x78/0x79, LSB 0x00) */
-   OMX_AUDIO_MIDISoundBankLayoutUser,         /**< Does not conform to any bank numbering standards */
-   OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-   OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-   OMX_AUDIO_MIDISoundBankLayoutMax = 0x7FFFFFFF
-} OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE;
-
-
-/** MIDI params to load/unload user soundbank
- * @ingroup midi
- */
-typedef struct OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U32 nDLSIndex;        /**< DLS file index to be loaded */
-    OMX_U32 nDLSSize;         /**< Size in bytes */
-    OMX_PTR pDLSData;         /**< Pointer to DLS file data */
-    OMX_AUDIO_MIDISOUNDBANKTYPE eMidiSoundBank;   /**< Midi sound bank type enumeration */
-    OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE eMidiSoundBankLayout; /**< Midi sound bank layout enumeration */
-} OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE;
-
-
-/** Structure for Live MIDI events and MIP messages.
- * (MIP = Maximum Instantaneous Polyphony; part of the SP-MIDI standard.)
- * @ingroup midi
- */
-typedef struct OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< Port that this structure applies to */
-    OMX_U32 nMidiEventSize;   /**< Size of immediate MIDI events or MIP message in bytes  */
-    OMX_U8 nMidiEvents[1];    /**< MIDI event array to be rendered immediately, or an
-                                   array for the MIP message buffer, where the size is
-                                   indicated by nMidiEventSize */
-} OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE;
-
-
-/** MIDI sound bank/ program pair in a given channel
- * @ingroup midi
- */
-typedef struct OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< Port that this structure applies to */
-    OMX_U32 nChannel;           /**< Valid channel values range from 1 to 16 */
-    OMX_U16 nIDProgram;         /**< Valid program ID range is 1 to 128 */
-    OMX_U16 nIDSoundBank;       /**< Sound bank ID */
-    OMX_U32 nUserSoundBankIndex;/**< User soundbank index, easier to access soundbanks
-                                     by index if multiple banks are present */
-} OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE;
-
-
-/** MIDI control
- * @ingroup midi
- */
-typedef struct OMX_AUDIO_CONFIG_MIDICONTROLTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_BS32 sPitchTransposition; /**< Pitch transposition in semitones, stored as Q22.10
-                                       format based on JAVA MMAPI (JSR-135) requirement */
-    OMX_BU32 sPlayBackRate;       /**< Relative playback rate, stored as Q14.17 fixed-point
-                                       number based on JSR-135 requirement */
-    OMX_BU32 sTempo ;             /**< Tempo in beats per minute (BPM), stored as Q22.10
-                                       fixed-point number based on JSR-135 requirement */
-    OMX_U32 nMaxPolyphony;        /**< Specifies the maximum simultaneous polyphonic
-                                       voices. A value of zero indicates that the default
-                                       polyphony of the device is used  */
-    OMX_U32 nNumRepeat;           /**< Number of times to repeat playback */
-    OMX_U32 nStopTime;            /**< Time in milliseconds to indicate when playback
-                                       will stop automatically.  Set to zero if not used */
-    OMX_U16 nChannelMuteMask;     /**< 16 bit mask for channel mute status */
-    OMX_U16 nChannelSoloMask;     /**< 16 bit mask for channel solo status */
-    OMX_U32 nTrack0031MuteMask;   /**< 32 bit mask for track mute status. Note: This is for tracks 0-31 */
-    OMX_U32 nTrack3263MuteMask;   /**< 32 bit mask for track mute status. Note: This is for tracks 32-63 */
-    OMX_U32 nTrack0031SoloMask;   /**< 32 bit mask for track solo status. Note: This is for tracks 0-31 */
-    OMX_U32 nTrack3263SoloMask;   /**< 32 bit mask for track solo status. Note: This is for tracks 32-63 */
-
-} OMX_AUDIO_CONFIG_MIDICONTROLTYPE;
-
-
-/** MIDI Playback States
- * @ingroup midi
- */
-typedef enum OMX_AUDIO_MIDIPLAYBACKSTATETYPE {
-  OMX_AUDIO_MIDIPlayBackStateUnknown = 0,      /**< Unknown state or state does not map to
-                                                    other defined states */
-  OMX_AUDIO_MIDIPlayBackStateClosedEngaged,    /**< No MIDI resource is currently open.
-                                                    The MIDI engine is currently processing
-                                                    MIDI events. */
-  OMX_AUDIO_MIDIPlayBackStateParsing,          /**< A MIDI resource is open and is being
-                                                    primed. The MIDI engine is currently
-                                                    processing MIDI events. */
-  OMX_AUDIO_MIDIPlayBackStateOpenEngaged,      /**< A MIDI resource is open and primed but
-                                                    not playing. The MIDI engine is currently
-                                                    processing MIDI events. The transition to
-                                                    this state is only possible from the
-                                                    OMX_AUDIO_MIDIPlayBackStatePlaying state,
-                                                    when the 'playback head' reaches the end
-                                                    of media data or the playback stops due
-                                                    to stop time set.*/
-  OMX_AUDIO_MIDIPlayBackStatePlaying,          /**< A MIDI resource is open and currently
-                                                    playing. The MIDI engine is currently
-                                                    processing MIDI events.*/
-  OMX_AUDIO_MIDIPlayBackStatePlayingPartially, /**< Best-effort playback due to SP-MIDI/DLS
-                                                    resource constraints */
-  OMX_AUDIO_MIDIPlayBackStatePlayingSilently,  /**< Due to system resource constraints and
-                                                    SP-MIDI content constraints, there is
-                                                    no audible MIDI content during playback
-                                                    currently. The situation may change if
-                                                    resources are freed later.*/
-  OMX_AUDIO_MIDIPlayBackStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-  OMX_AUDIO_MIDIPlayBackStateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-  OMX_AUDIO_MIDIPlayBackStateMax = 0x7FFFFFFF
-} OMX_AUDIO_MIDIPLAYBACKSTATETYPE;
-
-
-/** MIDI status
- * @ingroup midi
- */
-typedef struct OMX_AUDIO_CONFIG_MIDISTATUSTYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< port that this structure applies to */
-    OMX_U16 nNumTracks;         /**< Number of MIDI tracks in the file, read only field.
-                                     NOTE: May not return a meaningful value until the entire
-                                     file is parsed and buffered.  */
-    OMX_U32 nDuration;          /**< The length of the currently open MIDI resource
-                                     in milliseconds. NOTE: May not return a meaningful value
-                                     until the entire file is parsed and buffered.  */
-    OMX_U32 nPosition;          /**< Current Position of the MIDI resource being played
-                                     in milliseconds */
-    OMX_BOOL bVibra;            /**< Does Vibra track exist? NOTE: May not return a meaningful
-                                     value until the entire file is parsed and buffered. */
-    OMX_U32 nNumMetaEvents;     /**< Total number of MIDI Meta Events in the currently
-                                     open MIDI resource. NOTE: May not return a meaningful value
-                                     until the entire file is parsed and buffered.  */
-    OMX_U32 nNumActiveVoices;   /**< Number of active voices in the currently playing
-                                     MIDI resource. NOTE: May not return a meaningful value until
-                                     the entire file is parsed and buffered. */
-    OMX_AUDIO_MIDIPLAYBACKSTATETYPE eMIDIPlayBackState;  /**< MIDI playback state enumeration, read only field */
-} OMX_AUDIO_CONFIG_MIDISTATUSTYPE;
-
-
-/** MIDI Meta Event structure one per Meta Event.
- *  MIDI Meta Events are like audio metadata, except that they are interspersed
- *  with the MIDI content throughout the file and are not localized in the header.
- *  As such, it is necessary to retrieve information about these Meta Events from
- *  the engine, as it encounters these Meta Events within the MIDI content.
- *  For example, SMF files can have up to 14 types of MIDI Meta Events (copyright,
- *  author, default tempo, etc.) scattered throughout the file.
- *  @ingroup midi
- */
-typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE{
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U32 nIndex;           /**< Index of Meta Event */
-    OMX_U8 nMetaEventType;    /**< Meta Event Type, 7bits (i.e. 0 - 127) */
-    OMX_U32 nMetaEventSize;   /**< size of the Meta Event in bytes */
-    OMX_U32 nTrack;           /**< track number for the meta event */
-    OMX_U32 nPosition;        /**< Position of the meta-event in milliseconds */
-} OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE;
-
-
-/** MIDI Meta Event Data structure - one per Meta Event.
- * @ingroup midi
- */
-typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE{
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U32 nIndex;           /**< Index of Meta Event */
-    OMX_U32 nMetaEventSize;   /**< size of the Meta Event in bytes */
-    OMX_U8 nData[1];          /**< array of one or more bytes of meta data
-                                   as indicated by the nMetaEventSize field */
-} OMX_AUDIO_CONFIG__MIDIMETAEVENTDATATYPE;
-
-
-/** Audio Volume adjustment for a port */
-typedef struct OMX_AUDIO_CONFIG_VOLUMETYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< Port index indicating which port to
-                                     set.  Select the input port to set
-                                     just that port's volume.  Select the
-                                     output port to adjust the master
-                                     volume. */
-    OMX_BOOL bLinear;           /**< Is the volume to be set in linear (0.100)
-                                     or logarithmic scale (mB) */
-    OMX_BS32 sVolume;           /**< Volume linear setting in the 0..100 range, OR
-                                     Volume logarithmic setting for this port.  The values
-                                     for volume are in mB (millibels = 1/100 dB) relative
-                                     to a gain of 1 (e.g. the output is the same as the
-                                     input level).  Values are in mB from nMax
-                                     (maximum volume) to nMin mB (typically negative).
-                                     Since the volume is "voltage"
-                                     and not a "power", it takes a setting of
-                                     -600 mB to decrease the volume by 1/2.  If
-                                     a component cannot accurately set the
-                                     volume to the requested value, it must
-                                     set the volume to the closest value BELOW
-                                     the requested value.  When getting the
-                                     volume setting, the current actual volume
-                                     must be returned. */
-} OMX_AUDIO_CONFIG_VOLUMETYPE;
-
-
-/** Audio Volume adjustment for a channel */
-typedef struct OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< Port index indicating which port to
-                                     set.  Select the input port to set
-                                     just that port's volume.  Select the
-                                     output port to adjust the master
-                                     volume. */
-    OMX_U32 nChannel;           /**< channel to select from 0 to N-1,
-                                     using OMX_ALL to apply volume settings
-                                     to all channels */
-    OMX_BOOL bLinear;           /**< Is the volume to be set in linear (0.100) or
-                                     logarithmic scale (mB) */
-    OMX_BS32 sVolume;           /**< Volume linear setting in the 0..100 range, OR
-                                     Volume logarithmic setting for this port.
-                                     The values for volume are in mB
-                                     (millibels = 1/100 dB) relative to a gain
-                                     of 1 (e.g. the output is the same as the
-                                     input level).  Values are in mB from nMax
-                                     (maximum volume) to nMin mB (typically negative).
-                                     Since the volume is "voltage"
-                                     and not a "power", it takes a setting of
-                                     -600 mB to decrease the volume by 1/2.  If
-                                     a component cannot accurately set the
-                                     volume to the requested value, it must
-                                     set the volume to the closest value BELOW
-                                     the requested value.  When getting the
-                                     volume setting, the current actual volume
-                                     must be returned. */
-    OMX_BOOL bIsMIDI;           /**< TRUE if nChannel refers to a MIDI channel,
-                                     FALSE otherwise */
-} OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE;
-
-
-/** Audio balance setting */
-typedef struct OMX_AUDIO_CONFIG_BALANCETYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< Port index indicating which port to
-                                     set.  Select the input port to set
-                                     just that port's balance.  Select the
-                                     output port to adjust the master
-                                     balance. */
-    OMX_S32 nBalance;           /**< balance setting for this port
-                                     (-100 to 100, where -100 indicates
-                                     all left, and no right */
-} OMX_AUDIO_CONFIG_BALANCETYPE;
-
-
-/** Audio Port mute */
-typedef struct OMX_AUDIO_CONFIG_MUTETYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< Port index indicating which port to
-                                     set.  Select the input port to set
-                                     just that port's mute.  Select the
-                                     output port to adjust the master
-                                     mute. */
-    OMX_BOOL bMute;             /**< Mute setting for this port */
-} OMX_AUDIO_CONFIG_MUTETYPE;
-
-
-/** Audio Channel mute */
-typedef struct OMX_AUDIO_CONFIG_CHANNELMUTETYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< port that this structure applies to */
-    OMX_U32 nChannel;           /**< channel to select from 0 to N-1,
-                                     using OMX_ALL to apply mute settings
-                                     to all channels */
-    OMX_BOOL bMute;             /**< Mute setting for this channel */
-    OMX_BOOL bIsMIDI;           /**< TRUE if nChannel refers to a MIDI channel,
-                                     FALSE otherwise */
-} OMX_AUDIO_CONFIG_CHANNELMUTETYPE;
-
-
-
-/** Enable / Disable for loudness control, which boosts bass and to a
- *  smaller extent high end frequencies to compensate for hearing
- *  ability at the extreme ends of the audio spectrum
- */
-typedef struct OMX_AUDIO_CONFIG_LOUDNESSTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_BOOL bLoudness;        /**< Enable/disable for loudness */
-} OMX_AUDIO_CONFIG_LOUDNESSTYPE;
-
-
-/** Enable / Disable for bass, which controls low frequencies
- */
-typedef struct OMX_AUDIO_CONFIG_BASSTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_BOOL bEnable;          /**< Enable/disable for bass control */
-    OMX_S32 nBass;             /**< bass setting for the port, as a
-                                    continuous value from -100 to 100
-                                    (0 means no change in bass level)*/
-} OMX_AUDIO_CONFIG_BASSTYPE;
-
-
-/** Enable / Disable for treble, which controls high frequencies tones
- */
-typedef struct OMX_AUDIO_CONFIG_TREBLETYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_BOOL bEnable;          /**< Enable/disable for treble control */
-    OMX_S32  nTreble;          /**< treble setting for the port, as a
-                                    continuous value from -100 to 100
-                                    (0 means no change in treble level) */
-} OMX_AUDIO_CONFIG_TREBLETYPE;
-
-
-/** An equalizer is typically used for two reasons: to compensate for an
- *  sub-optimal frequency response of a system to make it sound more natural
- *  or to create intentionally some unnatural coloring to the sound to create
- *  an effect.
- *  @ingroup effects
- */
-typedef struct OMX_AUDIO_CONFIG_EQUALIZERTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_BOOL bEnable;          /**< Enable/disable for equalizer */
-    OMX_BU32 sBandIndex;       /**< Band number to be set.  Upper Limit is
-                                    N-1, where N is the number of bands, lower limit is 0 */
-    OMX_BU32 sCenterFreq;      /**< Center frequecies in Hz.  This is a
-                                    read only element and is used to determine
-                                    the lower, center and upper frequency of
-                                    this band.  */
-    OMX_BS32 sBandLevel;       /**< band level in millibels */
-} OMX_AUDIO_CONFIG_EQUALIZERTYPE;
-
-
-/** Stereo widening mode type
- * @ingroup effects
- */
-typedef enum OMX_AUDIO_STEREOWIDENINGTYPE {
-    OMX_AUDIO_StereoWideningHeadphones,    /**< Stereo widening for loudspeakers */
-    OMX_AUDIO_StereoWideningLoudspeakers,  /**< Stereo widening for closely spaced loudspeakers */
-    OMX_AUDIO_StereoWideningKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_AUDIO_StereoWideningVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_AUDIO_StereoWideningMax = 0x7FFFFFFF
-} OMX_AUDIO_STEREOWIDENINGTYPE;
-
-
-/** Control for stereo widening, which is a special 2-channel
- *  case of the audio virtualizer effect. For example, for 5.1-channel
- *  output, it translates to virtual surround sound.
- * @ingroup effects
- */
-typedef struct OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_BOOL bEnable;          /**< Enable/disable for stereo widening control */
-    OMX_AUDIO_STEREOWIDENINGTYPE eWideningType; /**< Stereo widening algorithm type */
-    OMX_U32  nStereoWidening;  /**< stereo widening setting for the port,
-                                    as a continuous value from 0 to 100  */
-} OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE;
-
-
-/** The chorus effect (or ``choralizer'') is any signal processor which makes
- *  one sound source (such as a voice) sound like many such sources singing
- *  (or playing) in unison. Since performance in unison is never exact, chorus
- *  effects simulate this by making independently modified copies of the input
- *  signal. Modifications may include (1) delay, (2) frequency shift, and
- *  (3) amplitude modulation.
- * @ingroup effects
- */
-typedef struct OMX_AUDIO_CONFIG_CHORUSTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_BOOL bEnable;          /**< Enable/disable for chorus */
-    OMX_BU32 sDelay;           /**< average delay in milliseconds */
-    OMX_BU32 sModulationRate;  /**< rate of modulation in millihertz */
-    OMX_U32 nModulationDepth;  /**< depth of modulation as a percentage of
-                                    delay (i.e. 0 to 100) */
-    OMX_BU32 nFeedback;        /**< Feedback from chorus output to input in percentage */
-} OMX_AUDIO_CONFIG_CHORUSTYPE;
-
-
-/** Reverberation is part of the reflected sound that follows the early
- *  reflections. In a typical room, this consists of a dense succession of
- *  echoes whose energy decays exponentially. The reverberation effect structure
- *  as defined here includes both (early) reflections as well as (late) reverberations.
- * @ingroup effects
- */
-typedef struct OMX_AUDIO_CONFIG_REVERBERATIONTYPE {
-    OMX_U32 nSize;                /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;     /**< OMX specification version information */
-    OMX_U32 nPortIndex;           /**< port that this structure applies to */
-    OMX_BOOL bEnable;             /**< Enable/disable for reverberation control */
-    OMX_BS32 sRoomLevel;          /**< Intensity level for the whole room effect
-                                       (i.e. both early reflections and late
-                                       reverberation) in millibels */
-    OMX_BS32 sRoomHighFreqLevel;  /**< Attenuation at high frequencies
-                                       relative to the intensity at low
-                                       frequencies in millibels */
-    OMX_BS32 sReflectionsLevel;   /**< Intensity level of early reflections
-                                       (relative to room value), in millibels */
-    OMX_BU32 sReflectionsDelay;   /**< Delay time of the first reflection relative
-                                       to the direct path, in milliseconds */
-    OMX_BS32 sReverbLevel;        /**< Intensity level of late reverberation
-                                       relative to room level, in millibels */
-    OMX_BU32 sReverbDelay;        /**< Time delay from the first early reflection
-                                       to the beginning of the late reverberation
-                                       section, in milliseconds */
-    OMX_BU32 sDecayTime;          /**< Late reverberation decay time at low
-                                       frequencies, in milliseconds */
-    OMX_BU32 nDecayHighFreqRatio; /**< Ratio of high frequency decay time relative
-                                       to low frequency decay time in percent  */
-    OMX_U32 nDensity;             /**< Modal density in the late reverberation decay,
-                                       in percent (i.e. 0 - 100) */
-    OMX_U32 nDiffusion;           /**< Echo density in the late reverberation decay,
-                                       in percent (i.e. 0 - 100) */
-    OMX_BU32 sReferenceHighFreq;  /**< Reference high frequency in Hertz. This is
-                                       the frequency used as the reference for all
-                                       the high-frequency settings above */
-
-} OMX_AUDIO_CONFIG_REVERBERATIONTYPE;
-
-
-/** Possible settings for the Echo Cancelation structure to use
- * @ingroup effects
- */
-typedef enum OMX_AUDIO_ECHOCANTYPE {
-   OMX_AUDIO_EchoCanOff = 0,    /**< Echo Cancellation is disabled */
-   OMX_AUDIO_EchoCanNormal,     /**< Echo Cancellation normal operation -
-                                     echo from plastics and face */
-   OMX_AUDIO_EchoCanHFree,      /**< Echo Cancellation optimized for
-                                     Hands Free operation */
-   OMX_AUDIO_EchoCanCarKit,    /**< Echo Cancellation optimized for
-                                     Car Kit (longer echo) */
-   OMX_AUDIO_EchoCanKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-   OMX_AUDIO_EchoCanVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-   OMX_AUDIO_EchoCanMax = 0x7FFFFFFF
-} OMX_AUDIO_ECHOCANTYPE;
-
-
-/** Enable / Disable for echo cancelation, which removes undesired echo's
- *  from the audio
- * @ingroup effects
- */
-typedef struct OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_AUDIO_ECHOCANTYPE eEchoCancelation; /**< Echo cancelation settings */
-} OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE;
-
-
-/** Enable / Disable for noise reduction, which undesired noise from
- * the audio
- * @ingroup effects
- */
-typedef struct OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_U32 nPortIndex;        /**< port that this structure applies to */
-    OMX_BOOL bNoiseReduction;  /**< Enable/disable for noise reduction */
-} OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE;
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
diff --git a/include/media/openmax/OMX_AudioExt.h b/include/media/openmax/OMX_AudioExt.h
deleted file mode 100644
index 05c223212e..0000000000
--- a/include/media/openmax/OMX_AudioExt.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2010 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** OMX_AudioExt.h - OpenMax IL version 1.1.2
- * The OMX_AudioExt header file contains extensions to the
- * definitions used by both the application and the component to
- * access video items.
- */
-
-#ifndef OMX_AudioExt_h
-#define OMX_AudioExt_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Each OMX header shall 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_Core.h>
-
-#define OMX_AUDIO_AACToolAndroidSSBR (OMX_AUDIO_AACToolVendor << 0) /**< SSBR: MPEG-4 Single-rate (downsampled) Spectral Band Replication tool allowed or active */
-#define OMX_AUDIO_AACToolAndroidDSBR (OMX_AUDIO_AACToolVendor << 1) /**< DSBR: MPEG-4 Dual-rate Spectral Band Replication tool allowed or active */
-
-typedef enum OMX_AUDIO_CODINGEXTTYPE {
-    OMX_AUDIO_CodingAndroidUnused = OMX_AUDIO_CodingKhronosExtensions + 0x00100000,
-    OMX_AUDIO_CodingAndroidAC3,         /**< AC3 encoded data */
-    OMX_AUDIO_CodingAndroidOPUS,        /**< OPUS encoded data */
-    OMX_AUDIO_CodingAndroidEAC3,        /**< EAC3 encoded data */
-} OMX_AUDIO_CODINGEXTTYPE;
-
-typedef struct OMX_AUDIO_PARAM_ANDROID_AC3TYPE {
-    OMX_U32 nSize;                 /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;      /**< OMX specification version information */
-    OMX_U32 nPortIndex;            /**< port that this structure applies to */
-    OMX_U32 nChannels;             /**< Number of channels */
-    OMX_U32 nSampleRate;           /**< Sampling rate of the source data.  Use 0 for
-                                        variable or unknown sampling rate. */
-} OMX_AUDIO_PARAM_ANDROID_AC3TYPE;
-
-typedef struct OMX_AUDIO_PARAM_ANDROID_EAC3TYPE {
-    OMX_U32 nSize;                 /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;      /**< OMX specification version information */
-    OMX_U32 nPortIndex;            /**< port that this structure applies to */
-    OMX_U32 nChannels;             /**< Number of channels */
-    OMX_U32 nSampleRate;           /**< Sampling rate of the source data.  Use 0 for
-                                        variable or unknown sampling rate. */
-} OMX_AUDIO_PARAM_ANDROID_EAC3TYPE;
-
-typedef struct OMX_AUDIO_PARAM_ANDROID_OPUSTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< port that this structure applies to */
-    OMX_U32 nChannels;        /**< Number of channels */
-    OMX_U32 nBitRate;         /**< Bit rate of the encoded data data.  Use 0 for variable
-                                   rate or unknown bit rates. Encoding is set to the
-                                   bitrate closest to specified  value (in bps) */
-    OMX_U32 nSampleRate;      /**< Sampling rate of the source data.  Use 0 for
-                                   variable or unknown sampling rate. */
-    OMX_U32 nAudioBandWidth;  /**< Audio band width (in Hz) to which an encoder should
-                                   limit the audio signal. Use 0 to let encoder decide */
-} OMX_AUDIO_PARAM_ANDROID_OPUSTYPE;
-
-typedef struct OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_S32 nMaxOutputChannels;    /**< Maximum channel count to be output, -1 if unspecified, 0 if downmixing disabled */
-    OMX_S32 nDrcCut;               /**< The DRC attenuation factor, between 0 and 127, -1 if unspecified */
-    OMX_S32 nDrcBoost;             /**< The DRC amplification factor, between 0 and 127, -1 if unspecified */
-    OMX_S32 nHeavyCompression;     /**< 0 for light compression, 1 for heavy compression, -1 if unspecified */
-    OMX_S32 nTargetReferenceLevel; /**< Target reference level, between 0 and 127, -1 if unspecified */
-    OMX_S32 nEncodedTargetLevel;   /**< Target reference level assumed at the encoder, between 0 and 127, -1 if unspecified */
-    OMX_S32 nPCMLimiterEnable;     /**< Signal level limiting, 0 for disable, 1 for enable, -1 if unspecified */
-} OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE;
-
-typedef struct OMX_AUDIO_PARAM_ANDROID_PROFILETYPE {
-   OMX_U32 nSize;
-   OMX_VERSIONTYPE nVersion;
-   OMX_U32 nPortIndex;
-   OMX_U32 eProfile;      /**< type is OMX_AUDIO_AACPROFILETYPE or OMX_AUDIO_WMAPROFILETYPE
-                                 depending on context */
-   OMX_U32 nProfileIndex; /**< Used to query for individual profile support information */
-} OMX_AUDIO_PARAM_ANDROID_PROFILETYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* OMX_AudioExt_h */
-/* File EOF */
diff --git a/include/media/openmax/OMX_Component.h b/include/media/openmax/OMX_Component.h
deleted file mode 100644
index 0dc2c76972..0000000000
--- a/include/media/openmax/OMX_Component.h
+++ /dev/null
@@ -1,596 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** OMX_Component.h - OpenMax IL version 1.1.2
- *  The OMX_Component header file contains the definitions used to define
- *  the public interface of a component.  This header file is intended to
- *  be used by both the application and the component.
- */
-
-#ifndef OMX_Component_h
-#define OMX_Component_h
-
-#ifdef __cplusplus
-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_Audio.h>
-#include <OMX_Video.h>
-#include <OMX_Image.h>
-#include <OMX_Other.h>
-
-/** @ingroup comp */
-typedef enum OMX_PORTDOMAINTYPE {
-    OMX_PortDomainAudio,
-    OMX_PortDomainVideo,
-    OMX_PortDomainImage,
-    OMX_PortDomainOther,
-    OMX_PortDomainKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_PortDomainVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_PortDomainMax = 0x7ffffff
-} OMX_PORTDOMAINTYPE;
-
-/** @ingroup comp */
-typedef struct OMX_PARAM_PORTDEFINITIONTYPE {
-    OMX_U32 nSize;                 /**< Size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;      /**< OMX specification version information */
-    OMX_U32 nPortIndex;            /**< Port number the structure applies to */
-    OMX_DIRTYPE eDir;              /**< Direction (input or output) of this port */
-    OMX_U32 nBufferCountActual;    /**< The actual number of buffers allocated on this port */
-    OMX_U32 nBufferCountMin;       /**< The minimum number of buffers this port requires */
-    OMX_U32 nBufferSize;           /**< Size, in bytes, for buffers to be used for this channel */
-    OMX_BOOL bEnabled;             /**< Ports default to enabled and are enabled/disabled by
-                                        OMX_CommandPortEnable/OMX_CommandPortDisable.
-                                        When disabled a port is unpopulated. A disabled port
-                                        is not populated with buffers on a transition to IDLE. */
-    OMX_BOOL bPopulated;           /**< Port is populated with all of its buffers as indicated by
-                                        nBufferCountActual. A disabled port is always unpopulated.
-                                        An enabled port is populated on a transition to OMX_StateIdle
-                                        and unpopulated on a transition to loaded. */
-    OMX_PORTDOMAINTYPE eDomain;    /**< Domain of the port. Determines the contents of metadata below. */
-    union {
-        OMX_AUDIO_PORTDEFINITIONTYPE audio;
-        OMX_VIDEO_PORTDEFINITIONTYPE video;
-        OMX_IMAGE_PORTDEFINITIONTYPE image;
-        OMX_OTHER_PORTDEFINITIONTYPE other;
-    } format;
-    OMX_BOOL bBuffersContiguous;
-    OMX_U32 nBufferAlignment;
-} OMX_PARAM_PORTDEFINITIONTYPE;
-
-/** @ingroup comp */
-typedef struct OMX_PARAM_U32TYPE {
-    OMX_U32 nSize;                    /**< Size of this structure, in Bytes */
-    OMX_VERSIONTYPE nVersion;         /**< OMX specification version information */
-    OMX_U32 nPortIndex;               /**< port that this structure applies to */
-    OMX_U32 nU32;                     /**< U32 value */
-} OMX_PARAM_U32TYPE;
-
-/** @ingroup rpm */
-typedef enum OMX_SUSPENSIONPOLICYTYPE {
-    OMX_SuspensionDisabled, /**< No suspension; v1.0 behavior */
-    OMX_SuspensionEnabled,  /**< Suspension allowed */
-    OMX_SuspensionPolicyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_SuspensionPolicyStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_SuspensionPolicyMax = 0x7fffffff
-} OMX_SUSPENSIONPOLICYTYPE;
-
-/** @ingroup rpm */
-typedef struct OMX_PARAM_SUSPENSIONPOLICYTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_SUSPENSIONPOLICYTYPE ePolicy;
-} OMX_PARAM_SUSPENSIONPOLICYTYPE;
-
-/** @ingroup rpm */
-typedef enum OMX_SUSPENSIONTYPE {
-    OMX_NotSuspended, /**< component is not suspended */
-    OMX_Suspended,    /**< component is suspended */
-    OMX_SuspensionKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_SuspensionVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_SuspendMax = 0x7FFFFFFF
-} OMX_SUSPENSIONTYPE;
-
-/** @ingroup rpm */
-typedef struct OMX_PARAM_SUSPENSIONTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_SUSPENSIONTYPE eType;
-} OMX_PARAM_SUSPENSIONTYPE ;
-
-typedef struct OMX_CONFIG_BOOLEANTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bEnabled;
-} OMX_CONFIG_BOOLEANTYPE;
-
-/* Parameter specifying the content uri to use. */
-/** @ingroup cp */
-typedef struct OMX_PARAM_CONTENTURITYPE
-{
-    OMX_U32 nSize;                      /**< size of the structure in bytes, including
-                                             actual URI name */
-    OMX_VERSIONTYPE nVersion;           /**< OMX specification version information */
-    OMX_U8 contentURI[1];               /**< The URI name */
-} OMX_PARAM_CONTENTURITYPE;
-
-/* Parameter specifying the pipe to use. */
-/** @ingroup cp */
-typedef struct OMX_PARAM_CONTENTPIPETYPE
-{
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_HANDLETYPE hPipe;       /**< The pipe handle*/
-} OMX_PARAM_CONTENTPIPETYPE;
-
-/** @ingroup rpm */
-typedef struct OMX_RESOURCECONCEALMENTTYPE {
-    OMX_U32 nSize;             /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
-    OMX_BOOL bResourceConcealmentForbidden; /**< disallow the use of resource concealment
-                                            methods (like degrading algorithm quality to
-                                            lower resource consumption or functional bypass)
-                                            on a component as a resolution to resource conflicts. */
-} OMX_RESOURCECONCEALMENTTYPE;
-
-
-/** @ingroup metadata */
-typedef enum OMX_METADATACHARSETTYPE {
-    OMX_MetadataCharsetUnknown = 0,
-    OMX_MetadataCharsetASCII,
-    OMX_MetadataCharsetBinary,
-    OMX_MetadataCharsetCodePage1252,
-    OMX_MetadataCharsetUTF8,
-    OMX_MetadataCharsetJavaConformantUTF8,
-    OMX_MetadataCharsetUTF7,
-    OMX_MetadataCharsetImapUTF7,
-    OMX_MetadataCharsetUTF16LE,
-    OMX_MetadataCharsetUTF16BE,
-    OMX_MetadataCharsetGB12345,
-    OMX_MetadataCharsetHZGB2312,
-    OMX_MetadataCharsetGB2312,
-    OMX_MetadataCharsetGB18030,
-    OMX_MetadataCharsetGBK,
-    OMX_MetadataCharsetBig5,
-    OMX_MetadataCharsetISO88591,
-    OMX_MetadataCharsetISO88592,
-    OMX_MetadataCharsetISO88593,
-    OMX_MetadataCharsetISO88594,
-    OMX_MetadataCharsetISO88595,
-    OMX_MetadataCharsetISO88596,
-    OMX_MetadataCharsetISO88597,
-    OMX_MetadataCharsetISO88598,
-    OMX_MetadataCharsetISO88599,
-    OMX_MetadataCharsetISO885910,
-    OMX_MetadataCharsetISO885913,
-    OMX_MetadataCharsetISO885914,
-    OMX_MetadataCharsetISO885915,
-    OMX_MetadataCharsetShiftJIS,
-    OMX_MetadataCharsetISO2022JP,
-    OMX_MetadataCharsetISO2022JP1,
-    OMX_MetadataCharsetISOEUCJP,
-    OMX_MetadataCharsetSMS7Bit,
-    OMX_MetadataCharsetKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_MetadataCharsetVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_MetadataCharsetTypeMax= 0x7FFFFFFF
-} OMX_METADATACHARSETTYPE;
-
-/** @ingroup metadata */
-typedef enum OMX_METADATASCOPETYPE
-{
-    OMX_MetadataScopeAllLevels,
-    OMX_MetadataScopeTopLevel,
-    OMX_MetadataScopePortLevel,
-    OMX_MetadataScopeNodeLevel,
-    OMX_MetadataScopeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_MetadataScopeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_MetadataScopeTypeMax = 0x7fffffff
-} OMX_METADATASCOPETYPE;
-
-/** @ingroup metadata */
-typedef enum OMX_METADATASEARCHMODETYPE
-{
-    OMX_MetadataSearchValueSizeByIndex,
-    OMX_MetadataSearchItemByIndex,
-    OMX_MetadataSearchNextItemByKey,
-    OMX_MetadataSearchKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_MetadataSearchVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_MetadataSearchTypeMax = 0x7fffffff
-} OMX_METADATASEARCHMODETYPE;
-/** @ingroup metadata */
-typedef struct OMX_CONFIG_METADATAITEMCOUNTTYPE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_METADATASCOPETYPE eScopeMode;
-    OMX_U32 nScopeSpecifier;
-    OMX_U32 nMetadataItemCount;
-} OMX_CONFIG_METADATAITEMCOUNTTYPE;
-
-/** @ingroup metadata */
-typedef struct OMX_CONFIG_METADATAITEMTYPE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_METADATASCOPETYPE eScopeMode;
-    OMX_U32 nScopeSpecifier;
-    OMX_U32 nMetadataItemIndex;
-    OMX_METADATASEARCHMODETYPE eSearchMode;
-    OMX_METADATACHARSETTYPE eKeyCharset;
-    OMX_U8 nKeySizeUsed;
-    OMX_U8 nKey[128];
-    OMX_METADATACHARSETTYPE eValueCharset;
-    OMX_STRING sLanguageCountry;
-    OMX_U32 nValueMaxSize;
-    OMX_U32 nValueSizeUsed;
-    OMX_U8 nValue[1];
-} OMX_CONFIG_METADATAITEMTYPE;
-
-/* @ingroup metadata */
-typedef struct OMX_CONFIG_CONTAINERNODECOUNTTYPE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bAllKeys;
-    OMX_U32 nParentNodeID;
-    OMX_U32 nNumNodes;
-} OMX_CONFIG_CONTAINERNODECOUNTTYPE;
-
-/** @ingroup metadata */
-typedef struct OMX_CONFIG_CONTAINERNODEIDTYPE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bAllKeys;
-    OMX_U32 nParentNodeID;
-    OMX_U32 nNodeIndex;
-    OMX_U32 nNodeID;
-    OMX_STRING cNodeName;
-    OMX_BOOL bIsLeafType;
-} OMX_CONFIG_CONTAINERNODEIDTYPE;
-
-/** @ingroup metadata */
-typedef struct OMX_PARAM_METADATAFILTERTYPE
-{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bAllKeys;  /* if true then this structure refers to all keys and
-                         * the three key fields below are ignored */
-    OMX_METADATACHARSETTYPE eKeyCharset;
-    OMX_U32 nKeySizeUsed;
-    OMX_U8   nKey [128];
-    OMX_U32 nLanguageCountrySizeUsed;
-    OMX_U8 nLanguageCountry[128];
-    OMX_BOOL bEnabled;  /* if true then key is part of filter (e.g.
-                         * retained for query later). If false then
-                         * key is not part of filter */
-} OMX_PARAM_METADATAFILTERTYPE;
-
-/** The OMX_HANDLETYPE structure defines the component handle.  The component
- *  handle is used to access all of the component's public methods and also
- *  contains pointers to the component's private data area.  The component
- *  handle is initialized by the OMX core (with help from the component)
- *  during the process of loading the component.  After the component is
- *  successfully loaded, the application can safely access any of the
- *  component's public functions (although some may return an error because
- *  the state is inappropriate for the access).
- *
- *  @ingroup comp
- */
-typedef struct OMX_COMPONENTTYPE
-{
-    /** The size of this structure, in bytes.  It is the responsibility
-        of the allocator of this structure to fill in this value.  Since
-        this structure is allocated by the GetHandle function, this
-        function will fill in this value. */
-    OMX_U32 nSize;
-
-    /** nVersion is the version of the OMX specification that the structure
-        is built against.  It is the responsibility of the creator of this
-        structure to initialize this value and every user of this structure
-        should verify that it knows how to use the exact version of
-        this structure found herein. */
-    OMX_VERSIONTYPE nVersion;
-
-    /** pComponentPrivate is a pointer to the component private data area.
-        This member is allocated and initialized by the component when the
-        component is first loaded.  The application should not access this
-        data area. */
-    OMX_PTR pComponentPrivate;
-
-    /** pApplicationPrivate is a pointer that is a parameter to the
-        OMX_GetHandle method, and contains an application private value
-        provided by the IL client.  This application private data is
-        returned to the IL Client by OMX in all callbacks */
-    OMX_PTR pApplicationPrivate;
-
-    /** refer to OMX_GetComponentVersion in OMX_core.h or the OMX IL
-        specification for details on the GetComponentVersion method.
-     */
-    OMX_ERRORTYPE (*GetComponentVersion)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_OUT OMX_STRING pComponentName,
-            OMX_OUT OMX_VERSIONTYPE* pComponentVersion,
-            OMX_OUT OMX_VERSIONTYPE* pSpecVersion,
-            OMX_OUT OMX_UUIDTYPE* pComponentUUID);
-
-    /** refer to OMX_SendCommand in OMX_core.h or the OMX IL
-        specification for details on the SendCommand method.
-     */
-    OMX_ERRORTYPE (*SendCommand)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_COMMANDTYPE Cmd,
-            OMX_IN  OMX_U32 nParam1,
-            OMX_IN  OMX_PTR pCmdData);
-
-    /** refer to OMX_GetParameter in OMX_core.h or the OMX IL
-        specification for details on the GetParameter method.
-     */
-    OMX_ERRORTYPE (*GetParameter)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_INDEXTYPE nParamIndex,
-            OMX_INOUT OMX_PTR pComponentParameterStructure);
-
-
-    /** refer to OMX_SetParameter in OMX_core.h or the OMX IL
-        specification for details on the SetParameter method.
-     */
-    OMX_ERRORTYPE (*SetParameter)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_INDEXTYPE nIndex,
-            OMX_IN  OMX_PTR pComponentParameterStructure);
-
-
-    /** refer to OMX_GetConfig in OMX_core.h or the OMX IL
-        specification for details on the GetConfig method.
-     */
-    OMX_ERRORTYPE (*GetConfig)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_INDEXTYPE nIndex,
-            OMX_INOUT OMX_PTR pComponentConfigStructure);
-
-
-    /** refer to OMX_SetConfig in OMX_core.h or the OMX IL
-        specification for details on the SetConfig method.
-     */
-    OMX_ERRORTYPE (*SetConfig)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_INDEXTYPE nIndex,
-            OMX_IN  OMX_PTR pComponentConfigStructure);
-
-
-    /** refer to OMX_GetExtensionIndex in OMX_core.h or the OMX IL
-        specification for details on the GetExtensionIndex method.
-     */
-    OMX_ERRORTYPE (*GetExtensionIndex)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_STRING cParameterName,
-            OMX_OUT OMX_INDEXTYPE* pIndexType);
-
-
-    /** refer to OMX_GetState in OMX_core.h or the OMX IL
-        specification for details on the GetState method.
-     */
-    OMX_ERRORTYPE (*GetState)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_OUT OMX_STATETYPE* pState);
-
-
-    /** The ComponentTunnelRequest method will interact with another OMX
-        component to determine if tunneling is possible and to setup the
-        tunneling.  The return codes for this method can be used to
-        determine if tunneling is not possible, or if tunneling is not
-        supported.
-
-        Base profile components (i.e. non-interop) do not support this
-        method and should return OMX_ErrorNotImplemented
-
-        The interop profile component MUST support tunneling to another
-        interop profile component with a compatible port parameters.
-        A component may also support proprietary communication.
-
-        If proprietary communication is supported the negotiation of
-        proprietary communication is done outside of OMX in a vendor
-        specific way. It is only required that the proper result be
-        returned and the details of how the setup is done is left
-        to the component implementation.
-
-        When this method is invoked when nPort in an output port, the
-        component will:
-        1.  Populate the pTunnelSetup structure with the output port's
-            requirements and constraints for the tunnel.
-
-        When this method is invoked when nPort in an input port, the
-        component will:
-        1.  Query the necessary parameters from the output port to
-            determine if the ports are compatible for tunneling
-        2.  If the ports are compatible, the component should store
-            the tunnel step provided by the output port
-        3.  Determine which port (either input or output) is the buffer
-            supplier, and call OMX_SetParameter on the output port to
-            indicate this selection.
-
-        The component will return from this call within 5 msec.
-
-        @param [in] hComp
-            Handle of the component to be accessed.  This is the component
-            handle returned by the call to the OMX_GetHandle method.
-        @param [in] nPort
-            nPort is used to select the port on the component to be used
-            for tunneling.
-        @param [in] hTunneledComp
-            Handle of the component to tunnel with.  This is the component
-            handle returned by the call to the OMX_GetHandle method.  When
-            this parameter is 0x0 the component should setup the port for
-            communication with the application / IL Client.
-        @param [in] nPortOutput
-            nPortOutput is used indicate the port the component should
-            tunnel with.
-        @param [in] pTunnelSetup
-            Pointer to the tunnel setup structure.  When nPort is an output port
-            the component should populate the fields of this structure.  When
-            When nPort is an input port the component should review the setup
-            provided by the component with the output port.
-        @return OMX_ERRORTYPE
-            If the command successfully executes, the return code will be
-            OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-        @ingroup tun
-    */
-
-    OMX_ERRORTYPE (*ComponentTunnelRequest)(
-        OMX_IN  OMX_HANDLETYPE hComp,
-        OMX_IN  OMX_U32 nPort,
-        OMX_IN  OMX_HANDLETYPE hTunneledComp,
-        OMX_IN  OMX_U32 nTunneledPort,
-        OMX_INOUT  OMX_TUNNELSETUPTYPE* pTunnelSetup);
-
-    /** refer to OMX_UseBuffer in OMX_core.h or the OMX IL
-        specification for details on the UseBuffer method.
-        @ingroup buf
-     */
-    OMX_ERRORTYPE (*UseBuffer)(
-            OMX_IN OMX_HANDLETYPE hComponent,
-            OMX_INOUT OMX_BUFFERHEADERTYPE** ppBufferHdr,
-            OMX_IN OMX_U32 nPortIndex,
-            OMX_IN OMX_PTR pAppPrivate,
-            OMX_IN OMX_U32 nSizeBytes,
-            OMX_IN OMX_U8* pBuffer);
-
-    /** refer to OMX_AllocateBuffer in OMX_core.h or the OMX IL
-        specification for details on the AllocateBuffer method.
-        @ingroup buf
-     */
-    OMX_ERRORTYPE (*AllocateBuffer)(
-            OMX_IN OMX_HANDLETYPE hComponent,
-            OMX_INOUT OMX_BUFFERHEADERTYPE** ppBuffer,
-            OMX_IN OMX_U32 nPortIndex,
-            OMX_IN OMX_PTR pAppPrivate,
-            OMX_IN OMX_U32 nSizeBytes);
-
-    /** refer to OMX_FreeBuffer in OMX_core.h or the OMX IL
-        specification for details on the FreeBuffer method.
-        @ingroup buf
-     */
-    OMX_ERRORTYPE (*FreeBuffer)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_U32 nPortIndex,
-            OMX_IN  OMX_BUFFERHEADERTYPE* pBuffer);
-
-    /** refer to OMX_EmptyThisBuffer in OMX_core.h or the OMX IL
-        specification for details on the EmptyThisBuffer method.
-        @ingroup buf
-     */
-    OMX_ERRORTYPE (*EmptyThisBuffer)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_BUFFERHEADERTYPE* pBuffer);
-
-    /** refer to OMX_FillThisBuffer in OMX_core.h or the OMX IL
-        specification for details on the FillThisBuffer method.
-        @ingroup buf
-     */
-    OMX_ERRORTYPE (*FillThisBuffer)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_BUFFERHEADERTYPE* pBuffer);
-
-    /** The SetCallbacks method is used by the core to specify the callback
-        structure from the application to the component.  This is a blocking
-        call.  The component will return from this call within 5 msec.
-        @param [in] hComponent
-            Handle of the component to be accessed.  This is the component
-            handle returned by the call to the GetHandle function.
-        @param [in] pCallbacks
-            pointer to an OMX_CALLBACKTYPE structure used to provide the
-            callback information to the component
-        @param [in] pAppData
-            pointer to an application defined value.  It is anticipated that
-            the application will pass a pointer to a data structure or a "this
-            pointer" in this area to allow the callback (in the application)
-            to determine the context of the call
-        @return OMX_ERRORTYPE
-            If the command successfully executes, the return code will be
-            OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-     */
-    OMX_ERRORTYPE (*SetCallbacks)(
-            OMX_IN  OMX_HANDLETYPE hComponent,
-            OMX_IN  OMX_CALLBACKTYPE* pCallbacks,
-            OMX_IN  OMX_PTR pAppData);
-
-    /** ComponentDeInit method is used to deinitialize the component
-        providing a means to free any resources allocated at component
-        initialization.  NOTE:  After this call the component handle is
-        not valid for further use.
-        @param [in] hComponent
-            Handle of the component to be accessed.  This is the component
-            handle returned by the call to the GetHandle function.
-        @return OMX_ERRORTYPE
-            If the command successfully executes, the return code will be
-            OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-     */
-    OMX_ERRORTYPE (*ComponentDeInit)(
-            OMX_IN  OMX_HANDLETYPE hComponent);
-
-    /** @ingroup buf */
-    OMX_ERRORTYPE (*UseEGLImage)(
-            OMX_IN OMX_HANDLETYPE hComponent,
-            OMX_INOUT OMX_BUFFERHEADERTYPE** ppBufferHdr,
-            OMX_IN OMX_U32 nPortIndex,
-            OMX_IN OMX_PTR pAppPrivate,
-            OMX_IN void* eglImage);
-
-    OMX_ERRORTYPE (*ComponentRoleEnum)(
-        OMX_IN OMX_HANDLETYPE hComponent,
-        OMX_OUT OMX_U8 *cRole,
-        OMX_IN OMX_U32 nIndex);
-
-} OMX_COMPONENTTYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
diff --git a/include/media/openmax/OMX_ContentPipe.h b/include/media/openmax/OMX_ContentPipe.h
deleted file mode 100644
index 0224c8a2ee..0000000000
--- a/include/media/openmax/OMX_ContentPipe.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** OMX_ContentPipe.h - OpenMax IL version 1.1.2
- *  The OMX_ContentPipe header file contains the definitions used to define
- *  the public interface for content piples.  This header file is intended to
- *  be used by the component.
- */
-
-#ifndef OMX_CONTENTPIPE_H
-#define OMX_CONTENTPIPE_H
-
-#ifndef KD_EACCES
-/* OpenKODE error codes. CPResult values may be zero (indicating success
-   or one of the following values) */
-#define KD_EACCES (1)
-#define KD_EADDRINUSE (2)
-#define KD_EAGAIN (5)
-#define KD_EBADF (7)
-#define KD_EBUSY (8)
-#define KD_ECONNREFUSED (9)
-#define KD_ECONNRESET (10)
-#define KD_EDEADLK (11)
-#define KD_EDESTADDRREQ (12)
-#define KD_ERANGE (35)
-#define KD_EEXIST (13)
-#define KD_EFBIG (14)
-#define KD_EHOSTUNREACH (15)
-#define KD_EINVAL (17)
-#define KD_EIO (18)
-#define KD_EISCONN (20)
-#define KD_EISDIR (21)
-#define KD_EMFILE (22)
-#define KD_ENAMETOOLONG (23)
-#define KD_ENOENT (24)
-#define KD_ENOMEM (25)
-#define KD_ENOSPC (26)
-#define KD_ENOSYS (27)
-#define KD_ENOTCONN (28)
-#define KD_EPERM (33)
-#define KD_ETIMEDOUT (36)
-#define KD_EILSEQ (19)
-#endif
-
-/** Map types from OMX standard types only here so interface is as generic as possible. */
-typedef OMX_U32    CPresult;
-typedef char *     CPstring;
-typedef void *     CPhandle;
-typedef OMX_U32    CPuint;
-typedef OMX_S32    CPint;
-typedef char       CPbyte;
-typedef OMX_BOOL   CPbool;
-
-/** enumeration of origin types used in the CP_PIPETYPE's Seek function
- * @ingroup cp
- */
-typedef enum CP_ORIGINTYPE {
-    CP_OriginBegin,
-    CP_OriginCur,
-    CP_OriginEnd,
-    CP_OriginKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    CP_OriginVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    CP_OriginMax = 0X7FFFFFFF
-} CP_ORIGINTYPE;
-
-/** enumeration of contact access types used in the CP_PIPETYPE's Open function
- * @ingroup cp
- */
-typedef enum CP_ACCESSTYPE {
-    CP_AccessRead,
-    CP_AccessWrite,
-    CP_AccessReadWrite,
-    CP_AccessKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    CP_AccessVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    CP_AccessMax = 0X7FFFFFFF
-} CP_ACCESSTYPE;
-
-/** enumeration of results returned by the CP_PIPETYPE's CheckAvailableBytes function
- * @ingroup cp
- */
-typedef enum CP_CHECKBYTESRESULTTYPE
-{
-    CP_CheckBytesOk,                    /**< There are at least the request number
-                                              of bytes available */
-    CP_CheckBytesNotReady,              /**< The pipe is still retrieving bytes
-                                              and presently lacks sufficient bytes.
-                                              Client will be called when they are
-                                              sufficient bytes are available. */
-    CP_CheckBytesInsufficientBytes,     /**< The pipe has retrieved all bytes
-                                              but those available are less than those
-                                              requested */
-    CP_CheckBytesAtEndOfStream,         /**< The pipe has reached the end of stream
-                                              and no more bytes are available. */
-    CP_CheckBytesOutOfBuffers,          /**< All read/write buffers are currently in use. */
-    CP_CheckBytesKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    CP_CheckBytesVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    CP_CheckBytesMax = 0X7FFFFFFF
-} CP_CHECKBYTESRESULTTYPE;
-
-/** enumeration of content pipe events sent to the client callback.
- * @ingroup cp
- */
-typedef enum CP_EVENTTYPE{
-    CP_BytesAvailable,                      /** bytes requested in a CheckAvailableBytes call are now available*/
-    CP_Overflow,                            /** enumeration of content pipe events sent to the client callback*/
-    CP_PipeDisconnected,                    /** enumeration of content pipe events sent to the client callback*/
-    CP_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    CP_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    CP_EventMax = 0X7FFFFFFF
-} CP_EVENTTYPE;
-
-/** content pipe definition
- * @ingroup cp
- */
-typedef struct CP_PIPETYPE
-{
-    /** Open a content stream for reading or writing. */
-    CPresult (*Open)( CPhandle* hContent, CPstring szURI, CP_ACCESSTYPE eAccess );
-
-    /** Close a content stream. */
-    CPresult (*Close)( CPhandle hContent );
-
-    /** Create a content source and open it for writing. */
-    CPresult (*Create)( CPhandle *hContent, CPstring szURI );
-
-    /** Check the that specified number of bytes are available for reading or writing (depending on access type).*/
-    CPresult (*CheckAvailableBytes)( CPhandle hContent, CPuint nBytesRequested, CP_CHECKBYTESRESULTTYPE *eResult );
-
-    /** Seek to certain position in the content relative to the specified origin. */
-    CPresult (*SetPosition)( CPhandle  hContent, CPint nOffset, CP_ORIGINTYPE eOrigin);
-
-    /** Retrieve the current position relative to the start of the content. */
-    CPresult (*GetPosition)( CPhandle hContent, CPuint *pPosition);
-
-    /** Retrieve data of the specified size from the content stream (advance content pointer by size of data).
-       Note: pipe client provides pointer. This function is appropriate for small high frequency reads. */
-    CPresult (*Read)( CPhandle hContent, CPbyte *pData, CPuint nSize);
-
-    /** Retrieve a buffer allocated by the pipe that contains the requested number of bytes.
-       Buffer contains the next block of bytes, as specified by nSize, of the content. nSize also
-       returns the size of the block actually read. Content pointer advances the by the returned size.
-       Note: pipe provides pointer. This function is appropriate for large reads. The client must call
-       ReleaseReadBuffer when done with buffer.
-
-       In some cases the requested block may not reside in contiguous memory within the
-       pipe implementation. For instance if the pipe leverages a circular buffer then the requested
-       block may straddle the boundary of the circular buffer. By default a pipe implementation
-       performs a copy in this case to provide the block to the pipe client in one contiguous buffer.
-       If, however, the client sets bForbidCopy, then the pipe returns only those bytes preceding the memory
-       boundary. Here the client may retrieve the data in segments over successive calls. */
-    CPresult (*ReadBuffer)( CPhandle hContent, CPbyte **ppBuffer, CPuint *nSize, CPbool bForbidCopy);
-
-    /** Release a buffer obtained by ReadBuffer back to the pipe. */
-    CPresult (*ReleaseReadBuffer)(CPhandle hContent, CPbyte *pBuffer);
-
-    /** Write data of the specified size to the content (advance content pointer by size of data).
-       Note: pipe client provides pointer. This function is appropriate for small high frequency writes. */
-    CPresult (*Write)( CPhandle hContent, CPbyte *data, CPuint nSize);
-
-    /** Retrieve a buffer allocated by the pipe used to write data to the content.
-       Client will fill buffer with output data. Note: pipe provides pointer. This function is appropriate
-       for large writes. The client must call WriteBuffer when done it has filled the buffer with data.*/
-    CPresult (*GetWriteBuffer)( CPhandle hContent, CPbyte **ppBuffer, CPuint nSize);
-
-    /** Deliver a buffer obtained via GetWriteBuffer to the pipe. Pipe will write the
-       the contents of the buffer to content and advance content pointer by the size of the buffer */
-    CPresult (*WriteBuffer)( CPhandle hContent, CPbyte *pBuffer, CPuint nFilledSize);
-
-    /** Register a per-handle client callback with the content pipe. */
-    CPresult (*RegisterCallback)( CPhandle hContent, CPresult (*ClientCallback)(CP_EVENTTYPE eEvent, CPuint iParam));
-
-} CP_PIPETYPE;
-
-#endif
-
diff --git a/include/media/openmax/OMX_Core.h b/include/media/openmax/OMX_Core.h
deleted file mode 100644
index bb974b3f88..0000000000
--- a/include/media/openmax/OMX_Core.h
+++ /dev/null
@@ -1,1488 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** OMX_Core.h - OpenMax IL version 1.1.2
- *  The OMX_Core header file contains the definitions used by both the
- *  application and the component to access common items.
- */
-
-#ifndef OMX_Core_h
-#define OMX_Core_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* Each OMX header shall 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_Index.h>
-
-
-/** The OMX_COMMANDTYPE enumeration is used to specify the action in the
- *  OMX_SendCommand macro.
- *  @ingroup core
- */
-typedef enum OMX_COMMANDTYPE
-{
-    OMX_CommandStateSet,    /**< Change the component state */
-    OMX_CommandFlush,       /**< Flush the data queue(s) of a component */
-    OMX_CommandPortDisable, /**< Disable a port on a component. */
-    OMX_CommandPortEnable,  /**< Enable a port on a component. */
-    OMX_CommandMarkBuffer,  /**< Mark a component/buffer for observation */
-    OMX_CommandKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_CommandVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_CommandMax = 0X7FFFFFFF
-} OMX_COMMANDTYPE;
-
-
-
-/** The OMX_STATETYPE enumeration is used to indicate or change the component
- *  state.  This enumeration reflects the current state of the component when
- *  used with the OMX_GetState macro or becomes the parameter in a state change
- *  command when used with the OMX_SendCommand macro.
- *
- *  The component will be in the Loaded state after the component is initially
- *  loaded into memory.  In the Loaded state, the component is not allowed to
- *  allocate or hold resources other than to build it's internal parameter
- *  and configuration tables.  The application will send one or more
- *  SetParameters/GetParameters and SetConfig/GetConfig commands to the
- *  component and the component will record each of these parameter and
- *  configuration changes for use later.  When the application sends the
- *  Idle command, the component will acquire the resources needed for the
- *  specified configuration and will transition to the idle state if the
- *  allocation is successful.  If the component cannot successfully
- *  transition to the idle state for any reason, the state of the component
- *  shall be fully rolled back to the Loaded state (e.g. all allocated
- *  resources shall be released).  When the component receives the command
- *  to go to the Executing state, it shall begin processing buffers by
- *  sending all input buffers it holds to the application.  While
- *  the component is in the Idle state, the application may also send the
- *  Pause command.  If the component receives the pause command while in the
- *  Idle state, the component shall send all input buffers it holds to the
- *  application, but shall not begin processing buffers.  This will allow the
- *  application to prefill buffers.
- *
- *  @ingroup comp
- */
-
-typedef enum OMX_STATETYPE
-{
-    OMX_StateInvalid,      /**< component has detected that it's internal data
-                                structures are corrupted to the point that
-                                it cannot determine it's state properly */
-    OMX_StateLoaded,      /**< component has been loaded but has not completed
-                                initialization.  The OMX_SetParameter macro
-                                and the OMX_GetParameter macro are the only
-                                valid macros allowed to be sent to the
-                                component in this state. */
-    OMX_StateIdle,        /**< component initialization has been completed
-                                successfully and the component is ready to
-                                to start. */
-    OMX_StateExecuting,   /**< component has accepted the start command and
-                                is processing data (if data is available) */
-    OMX_StatePause,       /**< component has received pause command */
-    OMX_StateWaitForResources, /**< component is waiting for resources, either after
-                                preemption or before it gets the resources requested.
-                                See specification for complete details. */
-    OMX_StateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_StateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_StateMax = 0X7FFFFFFF
-} OMX_STATETYPE;
-
-/** The OMX_ERRORTYPE enumeration defines the standard OMX Errors.  These
- *  errors should cover most of the common failure cases.  However,
- *  vendors are free to add additional error messages of their own as
- *  long as they follow these rules:
- *  1.  Vendor error messages shall be in the range of 0x90000000 to
- *      0x9000FFFF.
- *  2.  Vendor error messages shall be defined in a header file provided
- *      with the component.  No error messages are allowed that are
- *      not defined.
- */
-typedef enum OMX_ERRORTYPE
-{
-  OMX_ErrorNone = 0,
-
-  /** There were insufficient resources to perform the requested operation */
-  OMX_ErrorInsufficientResources = (OMX_S32) 0x80001000,
-
-  /** There was an error, but the cause of the error could not be determined */
-  OMX_ErrorUndefined = (OMX_S32) 0x80001001,
-
-  /** The component name string was not valid */
-  OMX_ErrorInvalidComponentName = (OMX_S32) 0x80001002,
-
-  /** No component with the specified name string was found */
-  OMX_ErrorComponentNotFound = (OMX_S32) 0x80001003,
-
-  /** The component specified did not have a "OMX_ComponentInit" or
-      "OMX_ComponentDeInit entry point */
-  OMX_ErrorInvalidComponent = (OMX_S32) 0x80001004,
-
-  /** One or more parameters were not valid */
-  OMX_ErrorBadParameter = (OMX_S32) 0x80001005,
-
-  /** The requested function is not implemented */
-  OMX_ErrorNotImplemented = (OMX_S32) 0x80001006,
-
-  /** The buffer was emptied before the next buffer was ready */
-  OMX_ErrorUnderflow = (OMX_S32) 0x80001007,
-
-  /** The buffer was not available when it was needed */
-  OMX_ErrorOverflow = (OMX_S32) 0x80001008,
-
-  /** The hardware failed to respond as expected */
-  OMX_ErrorHardware = (OMX_S32) 0x80001009,
-
-  /** The component is in the state OMX_StateInvalid */
-  OMX_ErrorInvalidState = (OMX_S32) 0x8000100A,
-
-  /** Stream is found to be corrupt */
-  OMX_ErrorStreamCorrupt = (OMX_S32) 0x8000100B,
-
-  /** Ports being connected are not compatible */
-  OMX_ErrorPortsNotCompatible = (OMX_S32) 0x8000100C,
-
-  /** Resources allocated to an idle component have been
-      lost resulting in the component returning to the loaded state */
-  OMX_ErrorResourcesLost = (OMX_S32) 0x8000100D,
-
-  /** No more indicies can be enumerated */
-  OMX_ErrorNoMore = (OMX_S32) 0x8000100E,
-
-  /** The component detected a version mismatch */
-  OMX_ErrorVersionMismatch = (OMX_S32) 0x8000100F,
-
-  /** The component is not ready to return data at this time */
-  OMX_ErrorNotReady = (OMX_S32) 0x80001010,
-
-  /** There was a timeout that occurred */
-  OMX_ErrorTimeout = (OMX_S32) 0x80001011,
-
-  /** This error occurs when trying to transition into the state you are already in */
-  OMX_ErrorSameState = (OMX_S32) 0x80001012,
-
-  /** Resources allocated to an executing or paused component have been
-      preempted, causing the component to return to the idle state */
-  OMX_ErrorResourcesPreempted = (OMX_S32) 0x80001013,
-
-  /** A non-supplier port sends this error to the IL client (via the EventHandler callback)
-      during the allocation of buffers (on a transition from the LOADED to the IDLE state or
-      on a port restart) when it deems that it has waited an unusually long time for the supplier
-      to send it an allocated buffer via a UseBuffer call. */
-  OMX_ErrorPortUnresponsiveDuringAllocation = (OMX_S32) 0x80001014,
-
-  /** A non-supplier port sends this error to the IL client (via the EventHandler callback)
-      during the deallocation of buffers (on a transition from the IDLE to LOADED state or
-      on a port stop) when it deems that it has waited an unusually long time for the supplier
-      to request the deallocation of a buffer header via a FreeBuffer call. */
-  OMX_ErrorPortUnresponsiveDuringDeallocation = (OMX_S32) 0x80001015,
-
-  /** A supplier port sends this error to the IL client (via the EventHandler callback)
-      during the stopping of a port (either on a transition from the IDLE to LOADED
-      state or a port stop) when it deems that it has waited an unusually long time for
-      the non-supplier to return a buffer via an EmptyThisBuffer or FillThisBuffer call. */
-  OMX_ErrorPortUnresponsiveDuringStop = (OMX_S32) 0x80001016,
-
-  /** Attempting a state transtion that is not allowed */
-  OMX_ErrorIncorrectStateTransition = (OMX_S32) 0x80001017,
-
-  /* Attempting a command that is not allowed during the present state. */
-  OMX_ErrorIncorrectStateOperation = (OMX_S32) 0x80001018,
-
-  /** The values encapsulated in the parameter or config structure are not supported. */
-  OMX_ErrorUnsupportedSetting = (OMX_S32) 0x80001019,
-
-  /** The parameter or config indicated by the given index is not supported. */
-  OMX_ErrorUnsupportedIndex = (OMX_S32) 0x8000101A,
-
-  /** The port index supplied is incorrect. */
-  OMX_ErrorBadPortIndex = (OMX_S32) 0x8000101B,
-
-  /** The port has lost one or more of its buffers and it thus unpopulated. */
-  OMX_ErrorPortUnpopulated = (OMX_S32) 0x8000101C,
-
-  /** Component suspended due to temporary loss of resources */
-  OMX_ErrorComponentSuspended = (OMX_S32) 0x8000101D,
-
-  /** Component suspended due to an inability to acquire dynamic resources */
-  OMX_ErrorDynamicResourcesUnavailable = (OMX_S32) 0x8000101E,
-
-  /** When the macroblock error reporting is enabled the component returns new error
-  for every frame that has errors */
-  OMX_ErrorMbErrorsInFrame = (OMX_S32) 0x8000101F,
-
-  /** A component reports this error when it cannot parse or determine the format of an input stream. */
-  OMX_ErrorFormatNotDetected = (OMX_S32) 0x80001020,
-
-  /** The content open operation failed. */
-  OMX_ErrorContentPipeOpenFailed = (OMX_S32) 0x80001021,
-
-  /** The content creation operation failed. */
-  OMX_ErrorContentPipeCreationFailed = (OMX_S32) 0x80001022,
-
-  /** Separate table information is being used */
-  OMX_ErrorSeperateTablesUsed = (OMX_S32) 0x80001023,
-
-  /** Tunneling is unsupported by the component*/
-  OMX_ErrorTunnelingUnsupported = (OMX_S32) 0x80001024,
-
-  OMX_ErrorKhronosExtensions = (OMX_S32)0x8F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-  OMX_ErrorVendorStartUnused = (OMX_S32)0x90000000, /**< Reserved region for introducing Vendor Extensions */
-  OMX_ErrorMax = 0x7FFFFFFF
-} OMX_ERRORTYPE;
-
-/** @ingroup core */
-typedef OMX_ERRORTYPE (* OMX_COMPONENTINITTYPE)(OMX_IN  OMX_HANDLETYPE hComponent);
-
-/** @ingroup core */
-typedef struct OMX_COMPONENTREGISTERTYPE
-{
-  const char          * pName;       /* Component name, 128 byte limit (including '\0') applies */
-  OMX_COMPONENTINITTYPE pInitialize; /* Component instance initialization function */
-} OMX_COMPONENTREGISTERTYPE;
-
-/** @ingroup core */
-extern OMX_COMPONENTREGISTERTYPE OMX_ComponentRegistered[];
-
-/** @ingroup rpm */
-typedef struct OMX_PRIORITYMGMTTYPE {
- OMX_U32 nSize;             /**< size of the structure in bytes */
- OMX_VERSIONTYPE nVersion;  /**< OMX specification version information */
- OMX_U32 nGroupPriority;            /**< Priority of the component group */
- OMX_U32 nGroupID;                  /**< ID of the component group */
-} OMX_PRIORITYMGMTTYPE;
-
-/* Component name and Role names are limited to 128 characters including the terminating '\0'. */
-#define OMX_MAX_STRINGNAME_SIZE 128
-
-/** @ingroup comp */
-typedef struct OMX_PARAM_COMPONENTROLETYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U8 cRole[OMX_MAX_STRINGNAME_SIZE];  /**< name of standard component which defines component role */
-} OMX_PARAM_COMPONENTROLETYPE;
-
-/** End of Stream Buffer Flag:
-  *
-  * A component sets EOS when it has no more data to emit on a particular
-  * output port. Thus an output port shall set EOS on the last buffer it
-  * emits. A component's determination of when an output port should
-  * cease sending data is implemenation specific.
-  * @ingroup buf
-  */
-
-#define OMX_BUFFERFLAG_EOS 0x00000001
-
-/** Start Time Buffer Flag:
- *
- * The source of a stream (e.g. a demux component) sets the STARTTIME
- * flag on the buffer that contains the starting timestamp for the
- * stream. The starting timestamp corresponds to the first data that
- * should be displayed at startup or after a seek.
- * The first timestamp of the stream is not necessarily the start time.
- * For instance, in the case of a seek to a particular video frame,
- * the target frame may be an interframe. Thus the first buffer of
- * the stream will be the intra-frame preceding the target frame and
- * the starttime will occur with the target frame (with any other
- * required frames required to reconstruct the target intervening).
- *
- * The STARTTIME flag is directly associated with the buffer's
- * timestamp ' thus its association to buffer data and its
- * propagation is identical to the timestamp's.
- *
- * When a Sync Component client receives a buffer with the
- * STARTTIME flag it shall perform a SetConfig on its sync port
- * using OMX_ConfigTimeClientStartTime and passing the buffer's
- * timestamp.
- *
- * @ingroup buf
- */
-
-#define OMX_BUFFERFLAG_STARTTIME 0x00000002
-
-
-
-/** Decode Only Buffer Flag:
- *
- * The source of a stream (e.g. a demux component) sets the DECODEONLY
- * flag on any buffer that should shall be decoded but should not be
- * displayed. This flag is used, for instance, when a source seeks to
- * a target interframe that requires the decode of frames preceding the
- * target to facilitate the target's reconstruction. In this case the
- * source would emit the frames preceding the target downstream
- * but mark them as decode only.
- *
- * The DECODEONLY is associated with buffer data and propagated in a
- * manner identical to the buffer timestamp.
- *
- * A component that renders data should ignore all buffers with
- * the DECODEONLY flag set.
- *
- * @ingroup buf
- */
-
-#define OMX_BUFFERFLAG_DECODEONLY 0x00000004
-
-
-/* Data Corrupt Flag: This flag is set when the IL client believes the data in the associated buffer is corrupt
- * @ingroup buf
- */
-
-#define OMX_BUFFERFLAG_DATACORRUPT 0x00000008
-
-/* End of Frame: The buffer contains exactly one end of frame and no data
- *  occurs after the end of frame. This flag is an optional hint. The absence
- *  of this flag does not imply the absence of an end of frame within the buffer.
- * @ingroup buf
-*/
-#define OMX_BUFFERFLAG_ENDOFFRAME 0x00000010
-
-/* Sync Frame Flag: This flag is set when the buffer content contains a coded sync frame '
- *  a frame that has no dependency on any other frame information
- *  @ingroup buf
- */
-#define OMX_BUFFERFLAG_SYNCFRAME 0x00000020
-
-/* Extra data present flag: there is extra data appended to the data stream
- * residing in the buffer
- * @ingroup buf
- */
-#define OMX_BUFFERFLAG_EXTRADATA 0x00000040
-
-/** Codec Config Buffer Flag:
-* OMX_BUFFERFLAG_CODECCONFIG is an optional flag that is set by an
-* output port when all bytes in the buffer form part or all of a set of
-* codec specific configuration data.  Examples include SPS/PPS nal units
-* for OMX_VIDEO_CodingAVC or AudioSpecificConfig data for
-* OMX_AUDIO_CodingAAC.  Any component that for a given stream sets
-* OMX_BUFFERFLAG_CODECCONFIG shall not mix codec configuration bytes
-* with frame data in the same buffer, and shall send all buffers
-* containing codec configuration bytes before any buffers containing
-* frame data that those configurations bytes describe.
-* If the stream format for a particular codec has a frame specific
-* header at the start of each frame, for example OMX_AUDIO_CodingMP3 or
-* OMX_AUDIO_CodingAAC in ADTS mode, then these shall be presented as
-* normal without setting OMX_BUFFERFLAG_CODECCONFIG.
- * @ingroup buf
- */
-#define OMX_BUFFERFLAG_CODECCONFIG 0x00000080
-
-
-
-/** @ingroup buf */
-typedef struct OMX_BUFFERHEADERTYPE
-{
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U8* pBuffer;            /**< Pointer to actual block of memory
-                                     that is acting as the buffer */
-    OMX_U32 nAllocLen;          /**< size of the buffer allocated, in bytes */
-    OMX_U32 nFilledLen;         /**< number of bytes currently in the
-                                     buffer */
-    OMX_U32 nOffset;            /**< start offset of valid data in bytes from
-                                     the start of the buffer */
-    OMX_PTR pAppPrivate;        /**< pointer to any data the application
-                                     wants to associate with this buffer */
-    OMX_PTR pPlatformPrivate;   /**< pointer to any data the platform
-                                     wants to associate with this buffer */
-    OMX_PTR pInputPortPrivate;  /**< pointer to any data the input port
-                                     wants to associate with this buffer */
-    OMX_PTR pOutputPortPrivate; /**< pointer to any data the output port
-                                     wants to associate with this buffer */
-    OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will generate a
-                                              mark event upon processing this buffer. */
-    OMX_PTR pMarkData;          /**< Application specific data associated with
-                                     the mark sent on a mark event to disambiguate
-                                     this mark from others. */
-    OMX_U32 nTickCount;         /**< Optional entry that the component and
-                                     application can update with a tick count
-                                     when they access the component.  This
-                                     value should be in microseconds.  Since
-                                     this is a value relative to an arbitrary
-                                     starting point, this value cannot be used
-                                     to determine absolute time.  This is an
-                                     optional entry and not all components
-                                     will update it.*/
- OMX_TICKS nTimeStamp;          /**< Timestamp corresponding to the sample
-                                     starting at the first logical sample
-                                     boundary in the buffer. Timestamps of
-                                     successive samples within the buffer may
-                                     be inferred by adding the duration of the
-                                     of the preceding buffer to the timestamp
-                                     of the preceding buffer.*/
-  OMX_U32     nFlags;           /**< buffer specific flags */
-  OMX_U32 nOutputPortIndex;     /**< The index of the output port (if any) using
-                                     this buffer */
-  OMX_U32 nInputPortIndex;      /**< The index of the input port (if any) using
-                                     this buffer */
-} OMX_BUFFERHEADERTYPE;
-
-/** The OMX_EXTRADATATYPE enumeration is used to define the
- * possible extra data payload types.
- * NB: this enum is binary backwards compatible with the previous
- * OMX_EXTRADATA_QUANT define.  This should be replaced with
- * OMX_ExtraDataQuantization.
- */
-typedef enum OMX_EXTRADATATYPE
-{
-   OMX_ExtraDataNone = 0,                       /**< Indicates that no more extra data sections follow */
-   OMX_ExtraDataQuantization,                   /**< The data payload contains quantization data */
-   OMX_ExtraDataKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-   OMX_ExtraDataVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-   OMX_ExtraDataMax = 0x7FFFFFFF
-} OMX_EXTRADATATYPE;
-
-
-typedef struct OMX_OTHER_EXTRADATATYPE  {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_EXTRADATATYPE eType;       /* Extra Data type */
-    OMX_U32 nDataSize;   /* Size of the supporting data to follow */
-    OMX_U8  data[1];     /* Supporting data hint  */
-} OMX_OTHER_EXTRADATATYPE;
-
-/** @ingroup comp */
-typedef struct OMX_PORT_PARAM_TYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPorts;             /**< The number of ports for this component */
-    OMX_U32 nStartPortNumber;   /** first port number for this type of port */
-} OMX_PORT_PARAM_TYPE;
-
-/** @ingroup comp */
-typedef enum OMX_EVENTTYPE
-{
-    OMX_EventCmdComplete,         /**< component has sucessfully completed a command */
-    OMX_EventError,               /**< component has detected an error condition */
-    OMX_EventMark,                /**< component has detected a buffer mark */
-    OMX_EventPortSettingsChanged, /**< component is reported a port settings change */
-    OMX_EventBufferFlag,          /**< component has detected an EOS */
-    OMX_EventResourcesAcquired,   /**< component has been granted resources and is
-                                       automatically starting the state change from
-                                       OMX_StateWaitForResources to OMX_StateIdle. */
-    OMX_EventComponentResumed,     /**< Component resumed due to reacquisition of resources */
-    OMX_EventDynamicResourcesAvailable, /**< Component has acquired previously unavailable dynamic resources */
-    OMX_EventPortFormatDetected,      /**< Component has detected a supported format. */
-    OMX_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-
-    /** Event when tunneled decoder has rendered an output or reached EOS
-     *  nData1 must contain the number of timestamps returned
-     *  pEventData must point to an array of the OMX_VIDEO_RENDEREVENTTYPE structs containing the
-     *  render-timestamps of each frame. Component may batch rendered timestamps using this event,
-     *  but must signal the event no more than 40ms after the first frame in the batch. The frames
-     *  must be ordered by system timestamp inside and across batches.
-     *
-     *  The component shall signal the render-timestamp of the very first frame (as well as the
-     *  first frame after each flush) unbatched (with nData1 set to 1) within 5 msec.
-     *
-     *  If component is doing frame-rate conversion, it must signal the render time of each
-     *  converted frame, and must interpolate media timestamps for in-between frames.
-     *
-     *  When the component reached EOS, it must signal an EOS timestamp using the same mechanism.
-     *  This is in addition to the timestamp of the last rendered frame, and should follow that
-     *  frame.
-     */
-    OMX_EventOutputRendered = 0x7F000001,
-
-    /** For framework internal use only: event sent by OMXNodeInstance when it receives a graphic
-     *  input buffer with a new dataspace for encoding. |arg1| will contain the dataspace. |arg2|
-     *  will contain the ColorAspects requested by the component (or framework defaults) using
-     *  the following bitfield layout:
-     *
-     *       +----------+-------------+----------------+------------+
-     *       |   Range  |  Primaries  |  MatrixCoeffs  |  Transfer  |
-     *       +----------+-------------+----------------+------------+
-     *  bits:  31....24   23.......16   15...........8   7........0
-     *
-     *  TODO: We would really need to tie this to an output buffer, but OMX does not provide a
-     *  fool-proof way to do that for video encoders.
-     */
-    OMX_EventDataSpaceChanged,
-    OMX_EventMax = 0x7FFFFFFF
-} OMX_EVENTTYPE;
-
-typedef struct OMX_CALLBACKTYPE
-{
-    /** The EventHandler method is used to notify the application when an
-        event of interest occurs.  Events are defined in the OMX_EVENTTYPE
-        enumeration.  Please see that enumeration for details of what will
-        be returned for each type of event. Callbacks should not return
-        an error to the component, so if an error occurs, the application
-        shall handle it internally.  This is a blocking call.
-
-        The application should return from this call within 5 msec to avoid
-        blocking the component for an excessively long period of time.
-
-        @param hComponent
-            handle of the component to access.  This is the component
-            handle returned by the call to the GetHandle function.
-        @param pAppData
-            pointer to an application defined value that was provided in the
-            pAppData parameter to the OMX_GetHandle method for the component.
-            This application defined value is provided so that the application
-            can have a component specific context when receiving the callback.
-        @param eEvent
-            Event that the component wants to notify the application about.
-        @param nData1
-            nData will be the OMX_ERRORTYPE for an error event and will be
-            an OMX_COMMANDTYPE for a command complete event and OMX_INDEXTYPE for a OMX_PortSettingsChanged event.
-         @param nData2
-            nData2 will hold further information related to the event. Can be OMX_STATETYPE for
-            a OMX_CommandStateSet command or port index for a OMX_PortSettingsChanged event.
-            Default value is 0 if not used. )
-        @param pEventData
-            Pointer to additional event-specific data (see spec for meaning).
-      */
-
-   OMX_ERRORTYPE (*EventHandler)(
-        OMX_IN OMX_HANDLETYPE hComponent,
-        OMX_IN OMX_PTR pAppData,
-        OMX_IN OMX_EVENTTYPE eEvent,
-        OMX_IN OMX_U32 nData1,
-        OMX_IN OMX_U32 nData2,
-        OMX_IN OMX_PTR pEventData);
-
-    /** The EmptyBufferDone method is used to return emptied buffers from an
-        input port back to the application for reuse.  This is a blocking call
-        so the application should not attempt to refill the buffers during this
-        call, but should queue them and refill them in another thread.  There
-        is no error return, so the application shall handle any errors generated
-        internally.
-
-        The application should return from this call within 5 msec.
-
-        @param hComponent
-            handle of the component to access.  This is the component
-            handle returned by the call to the GetHandle function.
-        @param pAppData
-            pointer to an application defined value that was provided in the
-            pAppData parameter to the OMX_GetHandle method for the component.
-            This application defined value is provided so that the application
-            can have a component specific context when receiving the callback.
-        @param pBuffer
-            pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer
-            or AllocateBuffer indicating the buffer that was emptied.
-        @ingroup buf
-     */
-    OMX_ERRORTYPE (*EmptyBufferDone)(
-        OMX_IN OMX_HANDLETYPE hComponent,
-        OMX_IN OMX_PTR pAppData,
-        OMX_IN OMX_BUFFERHEADERTYPE* pBuffer);
-
-    /** The FillBufferDone method is used to return filled buffers from an
-        output port back to the application for emptying and then reuse.
-        This is a blocking call so the application should not attempt to
-        empty the buffers during this call, but should queue the buffers
-        and empty them in another thread.  There is no error return, so
-        the application shall handle any errors generated internally.  The
-        application shall also update the buffer header to indicate the
-        number of bytes placed into the buffer.
-
-        The application should return from this call within 5 msec.
-
-        @param hComponent
-            handle of the component to access.  This is the component
-            handle returned by the call to the GetHandle function.
-        @param pAppData
-            pointer to an application defined value that was provided in the
-            pAppData parameter to the OMX_GetHandle method for the component.
-            This application defined value is provided so that the application
-            can have a component specific context when receiving the callback.
-        @param pBuffer
-            pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer
-            or AllocateBuffer indicating the buffer that was filled.
-        @ingroup buf
-     */
-    OMX_ERRORTYPE (*FillBufferDone)(
-        OMX_OUT OMX_HANDLETYPE hComponent,
-        OMX_OUT OMX_PTR pAppData,
-        OMX_OUT OMX_BUFFERHEADERTYPE* pBuffer);
-
-} OMX_CALLBACKTYPE;
-
-/** The OMX_BUFFERSUPPLIERTYPE enumeration is used to dictate port supplier
-    preference when tunneling between two ports.
-    @ingroup tun buf
-*/
-typedef enum OMX_BUFFERSUPPLIERTYPE
-{
-    OMX_BufferSupplyUnspecified = 0x0, /**< port supplying the buffers is unspecified,
-                                              or don't care */
-    OMX_BufferSupplyInput,             /**< input port supplies the buffers */
-    OMX_BufferSupplyOutput,            /**< output port supplies the buffers */
-    OMX_BufferSupplyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_BufferSupplyVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_BufferSupplyMax = 0x7FFFFFFF
-} OMX_BUFFERSUPPLIERTYPE;
-
-
-/** buffer supplier parameter
- * @ingroup tun
- */
-typedef struct OMX_PARAM_BUFFERSUPPLIERTYPE {
-    OMX_U32 nSize; /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex; /**< port that this structure applies to */
-    OMX_BUFFERSUPPLIERTYPE eBufferSupplier; /**< buffer supplier */
-} OMX_PARAM_BUFFERSUPPLIERTYPE;
-
-
-/**< indicates that buffers received by an input port of a tunnel
-     may not modify the data in the buffers
-     @ingroup tun
- */
-#define OMX_PORTTUNNELFLAG_READONLY 0x00000001
-
-
-/** The OMX_TUNNELSETUPTYPE structure is used to pass data from an output
-    port to an input port as part the two ComponentTunnelRequest calls
-    resulting from a OMX_SetupTunnel call from the IL Client.
-    @ingroup tun
- */
-typedef struct OMX_TUNNELSETUPTYPE
-{
-    OMX_U32 nTunnelFlags;             /**< bit flags for tunneling */
-    OMX_BUFFERSUPPLIERTYPE eSupplier; /**< supplier preference */
-} OMX_TUNNELSETUPTYPE;
-
-/* OMX Component headers is included to enable the core to use
-   macros for functions into the component for OMX release 1.0.
-   Developers should not access any structures or data from within
-   the component header directly */
-/* TO BE REMOVED - #include <OMX_Component.h> */
-
-/** GetComponentVersion will return information about the component.
-    This is a blocking call.  This macro will go directly from the
-    application to the component (via a core macro).  The
-    component will return from this call within 5 msec.
-    @param [in] hComponent
-        handle of component to execute the command
-    @param [out] pComponentName
-        pointer to an empty string of length 128 bytes.  The component
-        will write its name into this string.  The name will be
-        terminated by a single zero byte.  The name of a component will
-        be 127 bytes or less to leave room for the trailing zero byte.
-        An example of a valid component name is "OMX.ABC.ChannelMixer\0".
-    @param [out] pComponentVersion
-        pointer to an OMX Version structure that the component will fill
-        in.  The component will fill in a value that indicates the
-        component version.  NOTE: the component version is NOT the same
-        as the OMX Specification version (found in all structures).  The
-        component version is defined by the vendor of the component and
-        its value is entirely up to the component vendor.
-    @param [out] pSpecVersion
-        pointer to an OMX Version structure that the component will fill
-        in.  The SpecVersion is the version of the specification that the
-        component was built against.  Please note that this value may or
-        may not match the structure's version.  For example, if the
-        component was built against the 2.0 specification, but the
-        application (which creates the structure is built against the
-        1.0 specification the versions would be different.
-    @param [out] pComponentUUID
-        pointer to the UUID of the component which will be filled in by
-        the component.  The UUID is a unique identifier that is set at
-        RUN time for the component and is unique to each instantion of
-        the component.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
- */
-#define OMX_GetComponentVersion(                            \
-        hComponent,                                         \
-        pComponentName,                                     \
-        pComponentVersion,                                  \
-        pSpecVersion,                                       \
-        pComponentUUID)                                     \
-    ((OMX_COMPONENTTYPE*)(hComponent))->GetComponentVersion(\
-        hComponent,                                         \
-        pComponentName,                                     \
-        pComponentVersion,                                  \
-        pSpecVersion,                                       \
-        pComponentUUID)                 /* Macro End */
-
-
-/** Send a command to the component.  This call is a non-blocking call.
-    The component should check the parameters and then queue the command
-    to the component thread to be executed.  The component thread shall
-    send the EventHandler() callback at the conclusion of the command.
-    This macro will go directly from the application to the component (via
-    a core macro).  The component will return from this call within 5 msec.
-
-    When the command is "OMX_CommandStateSet" the component will queue a
-    state transition to the new state idenfied in nParam.
-
-    The component shall transition from executing to loaded state within 500 msec.
-
-    When the command is "OMX_CommandFlush", to flush a port's buffer queues,
-    the command will force the component to return all buffers NOT CURRENTLY
-    BEING PROCESSED to the application, in the order in which the buffers
-    were received.
-
-    The component shall finish flusing each port within 5 msec.
-
-    When the command is "OMX_CommandPortDisable" or
-    "OMX_CommandPortEnable", the component's port (given by the value of
-    nParam) will be stopped or restarted.
-
-    The component shall finish disabling/reenabling each port within 5 msec.
-
-    When the command "OMX_CommandMarkBuffer" is used to mark a buffer, the
-    pCmdData will point to a OMX_MARKTYPE structure containing the component
-    handle of the component to examine the buffer chain for the mark.  nParam1
-    contains the index of the port on which the buffer mark is applied.
-
-    Specification text for more details.
-
-    @param [in] hComponent
-        handle of component to execute the command
-    @param [in] Cmd
-        Command for the component to execute
-    @param [in] nParam
-        Parameter for the command to be executed.  When Cmd has the value
-        OMX_CommandStateSet, value is a member of OMX_STATETYPE.  When Cmd has
-        the value OMX_CommandFlush, value of nParam indicates which port(s)
-        to flush. -1 is used to flush all ports a single port index will
-        only flush that port.  When Cmd has the value "OMX_CommandPortDisable"
-        or "OMX_CommandPortEnable", the component's port is given by
-        the value of nParam.  When Cmd has the value "OMX_CommandMarkBuffer"
-        the components pot is given by the value of nParam.
-    @param [in] pCmdData
-        Parameter pointing to the OMX_MARKTYPE structure when Cmd has the value
-        "OMX_CommandMarkBuffer".
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
- */
-#define OMX_SendCommand(                                    \
-         hComponent,                                        \
-         Cmd,                                               \
-         nParam,                                            \
-         pCmdData)                                          \
-     ((OMX_COMPONENTTYPE*)(hComponent))->SendCommand(       \
-         hComponent,                                        \
-         Cmd,                                               \
-         nParam,                                            \
-         pCmdData)                          /* Macro End */
-
-
-/** The OMX_GetParameter macro will get one of the current parameter
-    settings from the component.  This macro cannot only be invoked when
-    the component is in the OMX_StateInvalid state.  The nParamIndex
-    parameter is used to indicate which structure is being requested from
-    the component.  The application shall allocate the correct structure
-    and shall fill in the structure size and version information before
-    invoking this macro.  When the parameter applies to a port, the
-    caller shall fill in the appropriate nPortIndex value indicating the
-    port on which the parameter applies. If the component has not had
-    any settings changed, then the component should return a set of
-    valid DEFAULT  parameters for the component.  This is a blocking
-    call.
-
-    The component should return from this call within 20 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [in] nParamIndex
-        Index of the structure to be filled.  This value is from the
-        OMX_INDEXTYPE enumeration.
-    @param [in,out] pComponentParameterStructure
-        Pointer to application allocated structure to be filled by the
-        component.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
- */
-#define OMX_GetParameter(                                   \
-        hComponent,                                         \
-        nParamIndex,                                        \
-        pComponentParameterStructure)                       \
-    ((OMX_COMPONENTTYPE*)(hComponent))->GetParameter(       \
-        hComponent,                                         \
-        nParamIndex,                                        \
-        pComponentParameterStructure)    /* Macro End */
-
-
-/** The OMX_SetParameter macro will send an initialization parameter
-    structure to a component.  Each structure shall be sent one at a time,
-    in a separate invocation of the macro.  This macro can only be
-    invoked when the component is in the OMX_StateLoaded state, or the
-    port is disabled (when the parameter applies to a port). The
-    nParamIndex parameter is used to indicate which structure is being
-    passed to the component.  The application shall allocate the
-    correct structure and shall fill in the structure size and version
-    information (as well as the actual data) before invoking this macro.
-    The application is free to dispose of this structure after the call
-    as the component is required to copy any data it shall retain.  This
-    is a blocking call.
-
-    The component should return from this call within 20 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [in] nIndex
-        Index of the structure to be sent.  This value is from the
-        OMX_INDEXTYPE enumeration.
-    @param [in] pComponentParameterStructure
-        pointer to application allocated structure to be used for
-        initialization by the component.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
- */
-#define OMX_SetParameter(                                   \
-        hComponent,                                         \
-        nParamIndex,                                        \
-        pComponentParameterStructure)                       \
-    ((OMX_COMPONENTTYPE*)(hComponent))->SetParameter(       \
-        hComponent,                                         \
-        nParamIndex,                                        \
-        pComponentParameterStructure)    /* Macro End */
-
-
-/** The OMX_GetConfig macro will get one of the configuration structures
-    from a component.  This macro can be invoked anytime after the
-    component has been loaded.  The nParamIndex call parameter is used to
-    indicate which structure is being requested from the component.  The
-    application shall allocate the correct structure and shall fill in the
-    structure size and version information before invoking this macro.
-    If the component has not had this configuration parameter sent before,
-    then the component should return a set of valid DEFAULT values for the
-    component.  This is a blocking call.
-
-    The component should return from this call within 5 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [in] nIndex
-        Index of the structure to be filled.  This value is from the
-        OMX_INDEXTYPE enumeration.
-    @param [in,out] pComponentConfigStructure
-        pointer to application allocated structure to be filled by the
-        component.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
-*/
-#define OMX_GetConfig(                                      \
-        hComponent,                                         \
-        nConfigIndex,                                       \
-        pComponentConfigStructure)                          \
-    ((OMX_COMPONENTTYPE*)(hComponent))->GetConfig(          \
-        hComponent,                                         \
-        nConfigIndex,                                       \
-        pComponentConfigStructure)       /* Macro End */
-
-
-/** The OMX_SetConfig macro will send one of the configuration
-    structures to a component.  Each structure shall be sent one at a time,
-    each in a separate invocation of the macro.  This macro can be invoked
-    anytime after the component has been loaded.  The application shall
-    allocate the correct structure and shall fill in the structure size
-    and version information (as well as the actual data) before invoking
-    this macro.  The application is free to dispose of this structure after
-    the call as the component is required to copy any data it shall retain.
-    This is a blocking call.
-
-    The component should return from this call within 5 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [in] nConfigIndex
-        Index of the structure to be sent.  This value is from the
-        OMX_INDEXTYPE enumeration above.
-    @param [in] pComponentConfigStructure
-        pointer to application allocated structure to be used for
-        initialization by the component.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
- */
-#define OMX_SetConfig(                                      \
-        hComponent,                                         \
-        nConfigIndex,                                       \
-        pComponentConfigStructure)                          \
-    ((OMX_COMPONENTTYPE*)(hComponent))->SetConfig(          \
-        hComponent,                                         \
-        nConfigIndex,                                       \
-        pComponentConfigStructure)       /* Macro End */
-
-
-/** The OMX_GetExtensionIndex macro will invoke a component to translate
-    a vendor specific configuration or parameter string into an OMX
-    structure index.  There is no requirement for the vendor to support
-    this command for the indexes already found in the OMX_INDEXTYPE
-    enumeration (this is done to save space in small components).  The
-    component shall support all vendor supplied extension indexes not found
-    in the master OMX_INDEXTYPE enumeration.  This is a blocking call.
-
-    The component should return from this call within 5 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the GetHandle function.
-    @param [in] cParameterName
-        OMX_STRING that shall be less than 128 characters long including
-        the trailing null byte.  This is the string that will get
-        translated by the component into a configuration index.
-    @param [out] pIndexType
-        a pointer to a OMX_INDEXTYPE to receive the index value.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
- */
-#define OMX_GetExtensionIndex(                              \
-        hComponent,                                         \
-        cParameterName,                                     \
-        pIndexType)                                         \
-    ((OMX_COMPONENTTYPE*)(hComponent))->GetExtensionIndex(  \
-        hComponent,                                         \
-        cParameterName,                                     \
-        pIndexType)                     /* Macro End */
-
-
-/** The OMX_GetState macro will invoke the component to get the current
-    state of the component and place the state value into the location
-    pointed to by pState.
-
-    The component should return from this call within 5 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [out] pState
-        pointer to the location to receive the state.  The value returned
-        is one of the OMX_STATETYPE members
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp
- */
-#define OMX_GetState(                                       \
-        hComponent,                                         \
-        pState)                                             \
-    ((OMX_COMPONENTTYPE*)(hComponent))->GetState(           \
-        hComponent,                                         \
-        pState)                         /* Macro End */
-
-
-/** The OMX_UseBuffer macro will request that the component use
-    a buffer (and allocate its own buffer header) already allocated
-    by another component, or by the IL Client. This is a blocking
-    call.
-
-    The component should return from this call within 20 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [out] ppBuffer
-        pointer to an OMX_BUFFERHEADERTYPE structure used to receive the
-        pointer to the buffer header
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp buf
- */
-
-#define OMX_UseBuffer(                                      \
-           hComponent,                                      \
-           ppBufferHdr,                                     \
-           nPortIndex,                                      \
-           pAppPrivate,                                     \
-           nSizeBytes,                                      \
-           pBuffer)                                         \
-    ((OMX_COMPONENTTYPE*)(hComponent))->UseBuffer(          \
-           hComponent,                                      \
-           ppBufferHdr,                                     \
-           nPortIndex,                                      \
-           pAppPrivate,                                     \
-           nSizeBytes,                                      \
-           pBuffer)
-
-
-/** The OMX_AllocateBuffer macro will request that the component allocate
-    a new buffer and buffer header.  The component will allocate the
-    buffer and the buffer header and return a pointer to the buffer
-    header.  This is a blocking call.
-
-    The component should return from this call within 5 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [out] ppBuffer
-        pointer to an OMX_BUFFERHEADERTYPE structure used to receive
-        the pointer to the buffer header
-    @param [in] nPortIndex
-        nPortIndex is used to select the port on the component the buffer will
-        be used with.  The port can be found by using the nPortIndex
-        value as an index into the Port Definition array of the component.
-    @param [in] pAppPrivate
-        pAppPrivate is used to initialize the pAppPrivate member of the
-        buffer header structure.
-    @param [in] nSizeBytes
-        size of the buffer to allocate.  Used when bAllocateNew is true.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp buf
- */
-#define OMX_AllocateBuffer(                                 \
-        hComponent,                                         \
-        ppBuffer,                                           \
-        nPortIndex,                                         \
-        pAppPrivate,                                        \
-        nSizeBytes)                                         \
-    ((OMX_COMPONENTTYPE*)(hComponent))->AllocateBuffer(     \
-        hComponent,                                         \
-        ppBuffer,                                           \
-        nPortIndex,                                         \
-        pAppPrivate,                                        \
-        nSizeBytes)                     /* Macro End */
-
-
-/** The OMX_FreeBuffer macro will release a buffer header from the component
-    which was allocated using either OMX_AllocateBuffer or OMX_UseBuffer. If
-    the component allocated the buffer (see the OMX_UseBuffer macro) then
-    the component shall free the buffer and buffer header. This is a
-    blocking call.
-
-    The component should return from this call within 20 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [in] nPortIndex
-        nPortIndex is used to select the port on the component the buffer will
-        be used with.
-    @param [in] pBuffer
-        pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer
-        or AllocateBuffer.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp buf
- */
-#define OMX_FreeBuffer(                                     \
-        hComponent,                                         \
-        nPortIndex,                                         \
-        pBuffer)                                            \
-    ((OMX_COMPONENTTYPE*)(hComponent))->FreeBuffer(         \
-        hComponent,                                         \
-        nPortIndex,                                         \
-        pBuffer)                        /* Macro End */
-
-
-/** The OMX_EmptyThisBuffer macro will send a buffer full of data to an
-    input port of a component.  The buffer will be emptied by the component
-    and returned to the application via the EmptyBufferDone call back.
-    This is a non-blocking call in that the component will record the buffer
-    and return immediately and then empty the buffer, later, at the proper
-    time.  As expected, this macro may be invoked only while the component
-    is in the OMX_StateExecuting.  If nPortIndex does not specify an input
-    port, the component shall return an error.
-
-    The component should return from this call within 5 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [in] pBuffer
-        pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer
-        or AllocateBuffer.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp buf
- */
-#define OMX_EmptyThisBuffer(                                \
-        hComponent,                                         \
-        pBuffer)                                            \
-    ((OMX_COMPONENTTYPE*)(hComponent))->EmptyThisBuffer(    \
-        hComponent,                                         \
-        pBuffer)                        /* Macro End */
-
-
-/** The OMX_FillThisBuffer macro will send an empty buffer to an
-    output port of a component.  The buffer will be filled by the component
-    and returned to the application via the FillBufferDone call back.
-    This is a non-blocking call in that the component will record the buffer
-    and return immediately and then fill the buffer, later, at the proper
-    time.  As expected, this macro may be invoked only while the component
-    is in the OMX_ExecutingState.  If nPortIndex does not specify an output
-    port, the component shall return an error.
-
-    The component should return from this call within 5 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [in] pBuffer
-        pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer
-        or AllocateBuffer.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp buf
- */
-#define OMX_FillThisBuffer(                                 \
-        hComponent,                                         \
-        pBuffer)                                            \
-    ((OMX_COMPONENTTYPE*)(hComponent))->FillThisBuffer(     \
-        hComponent,                                         \
-        pBuffer)                        /* Macro End */
-
-
-
-/** The OMX_UseEGLImage macro will request that the component use
-    a EGLImage provided by EGL (and allocate its own buffer header)
-    This is a blocking call.
-
-    The component should return from this call within 20 msec.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the OMX_GetHandle function.
-    @param [out] ppBuffer
-        pointer to an OMX_BUFFERHEADERTYPE structure used to receive the
-        pointer to the buffer header.  Note that the memory location used
-        for this buffer is NOT visible to the IL Client.
-    @param [in] nPortIndex
-        nPortIndex is used to select the port on the component the buffer will
-        be used with.  The port can be found by using the nPortIndex
-        value as an index into the Port Definition array of the component.
-    @param [in] pAppPrivate
-        pAppPrivate is used to initialize the pAppPrivate member of the
-        buffer header structure.
-    @param [in] eglImage
-        eglImage contains the handle of the EGLImage to use as a buffer on the
-        specified port.  The component is expected to validate properties of
-        the EGLImage against the configuration of the port to ensure the component
-        can use the EGLImage as a buffer.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup comp buf
- */
-#define OMX_UseEGLImage(                                    \
-           hComponent,                                      \
-           ppBufferHdr,                                     \
-           nPortIndex,                                      \
-           pAppPrivate,                                     \
-           eglImage)                                        \
-    ((OMX_COMPONENTTYPE*)(hComponent))->UseEGLImage(        \
-           hComponent,                                      \
-           ppBufferHdr,                                     \
-           nPortIndex,                                      \
-           pAppPrivate,                                     \
-           eglImage)
-
-/** The OMX_Init method is used to initialize the OMX core.  It shall be the
-    first call made into OMX and it should only be executed one time without
-    an interviening OMX_Deinit call.
-
-    The core should return from this call within 20 msec.
-
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Init(void);
-
-
-/** The OMX_Deinit method is used to deinitialize the OMX core.  It shall be
-    the last call made into OMX. In the event that the core determines that
-    thare are components loaded when this call is made, the core may return
-    with an error rather than try to unload the components.
-
-    The core should return from this call within 20 msec.
-
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void);
-
-
-/** The OMX_ComponentNameEnum method will enumerate through all the names of
-    recognised valid components in the system. This function is provided
-    as a means to detect all the components in the system run-time. There is
-    no strict ordering to the enumeration order of component names, although
-    each name will only be enumerated once.  If the OMX core supports run-time
-    installation of new components, it is only requried to detect newly
-    installed components when the first call to enumerate component names
-    is made (i.e. when nIndex is 0x0).
-
-    The core should return from this call in 20 msec.
-
-    @param [out] cComponentName
-        pointer to a null terminated string with the component name.  The
-        names of the components are strings less than 127 bytes in length
-        plus the trailing null for a maximum size of 128 bytes.  An example
-        of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0".  Names are
-        assigned by the vendor, but shall start with "OMX." and then have
-        the Vendor designation next.
-    @param [in] nNameLength
-        number of characters in the cComponentName string.  With all
-        component name strings restricted to less than 128 characters
-        (including the trailing null) it is recomended that the caller
-        provide a input string for the cComponentName of 128 characters.
-    @param [in] nIndex
-        number containing the enumeration index for the component.
-        Multiple calls to OMX_ComponentNameEnum with increasing values
-        of nIndex will enumerate through the component names in the
-        system until OMX_ErrorNoMore is returned.  The value of nIndex
-        is 0 to (N-1), where N is the number of valid installed components
-        in the system.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  When the value of nIndex exceeds the number of
-        components in the system minus 1, OMX_ErrorNoMore will be
-        returned. Otherwise the appropriate OMX error will be returned.
-    @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum(
-    OMX_OUT OMX_STRING cComponentName,
-    OMX_IN  OMX_U32 nNameLength,
-    OMX_IN  OMX_U32 nIndex);
-
-
-/** The OMX_GetHandle method will locate the component specified by the
-    component name given, load that component into memory and then invoke
-    the component's methods to create an instance of the component.
-
-    The core should return from this call within 20 msec.
-
-    @param [out] pHandle
-        pointer to an OMX_HANDLETYPE pointer to be filled in by this method.
-    @param [in] cComponentName
-        pointer to a null terminated string with the component name.  The
-        names of the components are strings less than 127 bytes in length
-        plus the trailing null for a maximum size of 128 bytes.  An example
-        of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0".  Names are
-        assigned by the vendor, but shall start with "OMX." and then have
-        the Vendor designation next.
-    @param [in] pAppData
-        pointer to an application defined value that will be returned
-        during callbacks so that the application can identify the source
-        of the callback.
-    @param [in] pCallBacks
-        pointer to a OMX_CALLBACKTYPE structure that will be passed to the
-        component to initialize it with.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle(
-    OMX_OUT OMX_HANDLETYPE* pHandle,
-    OMX_IN  OMX_STRING cComponentName,
-    OMX_IN  OMX_PTR pAppData,
-    OMX_IN  OMX_CALLBACKTYPE* pCallBacks);
-
-
-/** The OMX_FreeHandle method will free a handle allocated by the OMX_GetHandle
-    method.  If the component reference count goes to zero, the component will
-    be unloaded from memory.
-
-    The core should return from this call within 20 msec when the component is
-    in the OMX_StateLoaded state.
-
-    @param [in] hComponent
-        Handle of the component to be accessed.  This is the component
-        handle returned by the call to the GetHandle function.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-    @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_FreeHandle(
-    OMX_IN  OMX_HANDLETYPE hComponent);
-
-
-
-/** The OMX_SetupTunnel method will handle the necessary calls to the components
-    to setup the specified tunnel the two components.  NOTE: This is
-    an actual method (not a #define macro).  This method will make calls into
-    the component ComponentTunnelRequest method to do the actual tunnel
-    connection.
-
-    The ComponentTunnelRequest method on both components will be called.
-    This method shall not be called unless the component is in the
-    OMX_StateLoaded state except when the ports used for the tunnel are
-    disabled. In this case, the component may be in the OMX_StateExecuting,
-    OMX_StatePause, or OMX_StateIdle states.
-
-    The core should return from this call within 20 msec.
-
-    @param [in] hOutput
-        Handle of the component to be accessed.  Also this is the handle
-        of the component whose port, specified in the nPortOutput parameter
-        will be used the source for the tunnel. This is the component handle
-        returned by the call to the OMX_GetHandle function.  There is a
-        requirement that hOutput be the source for the data when
-        tunelling (i.e. nPortOutput is an output port).  If 0x0, the component
-        specified in hInput will have it's port specified in nPortInput
-        setup for communication with the application / IL client.
-    @param [in] nPortOutput
-        nPortOutput is used to select the source port on component to be
-        used in the tunnel.
-    @param [in] hInput
-        This is the component to setup the tunnel with. This is the handle
-        of the component whose port, specified in the nPortInput parameter
-        will be used the destination for the tunnel. This is the component handle
-        returned by the call to the OMX_GetHandle function.  There is a
-        requirement that hInput be the destination for the data when
-        tunelling (i.e. nPortInut is an input port).   If 0x0, the component
-        specified in hOutput will have it's port specified in nPortPOutput
-        setup for communication with the application / IL client.
-    @param [in] nPortInput
-        nPortInput is used to select the destination port on component to be
-        used in the tunnel.
-    @return OMX_ERRORTYPE
-        If the command successfully executes, the return code will be
-        OMX_ErrorNone.  Otherwise the appropriate OMX error will be returned.
-        When OMX_ErrorNotImplemented is returned, one or both components is
-        a non-interop component and does not support tunneling.
-
-        On failure, the ports of both components are setup for communication
-        with the application / IL Client.
-    @ingroup core tun
- */
-OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_SetupTunnel(
-    OMX_IN  OMX_HANDLETYPE hOutput,
-    OMX_IN  OMX_U32 nPortOutput,
-    OMX_IN  OMX_HANDLETYPE hInput,
-    OMX_IN  OMX_U32 nPortInput);
-
-/** @ingroup cp */
-OMX_API OMX_ERRORTYPE   OMX_GetContentPipe(
-    OMX_OUT OMX_HANDLETYPE *hPipe,
-    OMX_IN OMX_STRING szURI);
-
-/** The OMX_GetComponentsOfRole method will return the number of components that support the given
-    role and (if the compNames field is non-NULL) the names of those components. The call will fail if
-    an insufficiently sized array of names is supplied. To ensure the array is sufficiently sized the
-    client should:
-        * first call this function with the compNames field NULL to determine the number of component names
-        * second call this function with the compNames field pointing to an array of names allocated
-          according to the number returned by the first call.
-
-    The core should return from this call within 5 msec.
-
-    @param [in] role
-        This is generic standard component name consisting only of component class
-        name and the type within that class (e.g. 'audio_decoder.aac').
-    @param [inout] pNumComps
-        This is used both as input and output.
-
-        If compNames is NULL, the input is ignored and the output specifies how many components support
-        the given role.
-
-        If compNames is not NULL, on input it bounds the size of the input structure and
-        on output, it specifies the number of components string names listed within the compNames parameter.
-    @param [inout] compNames
-        If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings which accepts
-        a list of the names of all physical components that implement the specified standard component name.
-        Each name is NULL terminated. numComps indicates the number of names.
-    @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole (
-    OMX_IN      OMX_STRING role,
-    OMX_INOUT   OMX_U32 *pNumComps,
-    OMX_INOUT   OMX_U8  **compNames);
-
-/** The OMX_GetRolesOfComponent method will return the number of roles supported by the given
-    component and (if the roles field is non-NULL) the names of those roles. The call will fail if
-    an insufficiently sized array of names is supplied. To ensure the array is sufficiently sized the
-    client should:
-        * first call this function with the roles field NULL to determine the number of role names
-        * second call this function with the roles field pointing to an array of names allocated
-          according to the number returned by the first call.
-
-    The core should return from this call within 5 msec.
-
-    @param [in] compName
-        This is the name of the component being queried about.
-    @param [inout] pNumRoles
-        This is used both as input and output.
-
-        If roles is NULL, the input is ignored and the output specifies how many roles the component supports.
-
-        If compNames is not NULL, on input it bounds the size of the input structure and
-        on output, it specifies the number of roles string names listed within the roles parameter.
-    @param [out] roles
-        If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings
-        which accepts a list of the names of all standard components roles implemented on the
-        specified component name. numComps indicates the number of names.
-    @ingroup core
- */
-OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent (
-    OMX_IN      OMX_STRING compName,
-    OMX_INOUT   OMX_U32 *pNumRoles,
-    OMX_OUT     OMX_U8 **roles);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
-
diff --git a/include/media/openmax/OMX_IVCommon.h b/include/media/openmax/OMX_IVCommon.h
deleted file mode 100644
index f9b6f4b0fd..0000000000
--- a/include/media/openmax/OMX_IVCommon.h
+++ /dev/null
@@ -1,958 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/**
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/**
- * @file OMX_IVCommon.h - OpenMax IL version 1.1.2
- *  The structures needed by Video and Image components to exchange
- *  parameters and configuration data with the components.
- */
-#ifndef OMX_IVCommon_h
-#define OMX_IVCommon_h
-
-#ifdef __cplusplus
-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_Core.h>
-
-/** @defgroup iv OpenMAX IL Imaging and Video Domain
- * Common structures for OpenMAX IL Imaging and Video domains
- * @{
- */
-
-
-/**
- * Enumeration defining possible uncompressed image/video formats.
- *
- * ENUMS:
- *  Unused                 : Placeholder value when format is N/A
- *  Monochrome             : black and white
- *  8bitRGB332             : Red 7:5, Green 4:2, Blue 1:0
- *  12bitRGB444            : Red 11:8, Green 7:4, Blue 3:0
- *  16bitARGB4444          : Alpha 15:12, Red 11:8, Green 7:4, Blue 3:0
- *  16bitARGB1555          : Alpha 15, Red 14:10, Green 9:5, Blue 4:0
- *  16bitRGB565            : Red 15:11, Green 10:5, Blue 4:0
- *  16bitBGR565            : Blue 15:11, Green 10:5, Red 4:0
- *  18bitRGB666            : Red 17:12, Green 11:6, Blue 5:0
- *  18bitARGB1665          : Alpha 17, Red 16:11, Green 10:5, Blue 4:0
- *  19bitARGB1666          : Alpha 18, Red 17:12, Green 11:6, Blue 5:0
- *  24bitRGB888            : Red 24:16, Green 15:8, Blue 7:0
- *  24bitBGR888            : Blue 24:16, Green 15:8, Red 7:0
- *  24bitARGB1887          : Alpha 23, Red 22:15, Green 14:7, Blue 6:0
- *  25bitARGB1888          : Alpha 24, Red 23:16, Green 15:8, Blue 7:0
- *  32bitBGRA8888          : Blue 31:24, Green 23:16, Red 15:8, Alpha 7:0
- *  32bitARGB8888          : Alpha 31:24, Red 23:16, Green 15:8, Blue 7:0
- *  YUV411Planar           : U,Y are subsampled by a factor of 4 horizontally
- *  YUV411PackedPlanar     : packed per payload in planar slices
- *  YUV420Planar           : Three arrays Y,U,V.
- *  YUV420PackedPlanar     : packed per payload in planar slices
- *  YUV420SemiPlanar       : Two arrays, one is all Y, the other is U and V
- *  YUV422Planar           : Three arrays Y,U,V.
- *  YUV422PackedPlanar     : packed per payload in planar slices
- *  YUV422SemiPlanar       : Two arrays, one is all Y, the other is U and V
- *  YCbYCr                 : Organized as 16bit YUYV (i.e. YCbYCr)
- *  YCrYCb                 : Organized as 16bit YVYU (i.e. YCrYCb)
- *  CbYCrY                 : Organized as 16bit UYVY (i.e. CbYCrY)
- *  CrYCbY                 : Organized as 16bit VYUY (i.e. CrYCbY)
- *  YUV444Interleaved      : Each pixel contains equal parts YUV
- *  RawBayer8bit           : SMIA camera output format
- *  RawBayer10bit          : SMIA camera output format
- *  RawBayer8bitcompressed : SMIA camera output format
- */
-typedef enum OMX_COLOR_FORMATTYPE {
-    OMX_COLOR_FormatUnused,
-    OMX_COLOR_FormatMonochrome,
-    OMX_COLOR_Format8bitRGB332,
-    OMX_COLOR_Format12bitRGB444,
-    OMX_COLOR_Format16bitARGB4444,
-    OMX_COLOR_Format16bitARGB1555,
-    OMX_COLOR_Format16bitRGB565,
-    OMX_COLOR_Format16bitBGR565,
-    OMX_COLOR_Format18bitRGB666,
-    OMX_COLOR_Format18bitARGB1665,
-    OMX_COLOR_Format19bitARGB1666,
-    OMX_COLOR_Format24bitRGB888,
-    OMX_COLOR_Format24bitBGR888,
-    OMX_COLOR_Format24bitARGB1887,
-    OMX_COLOR_Format25bitARGB1888,
-    OMX_COLOR_Format32bitBGRA8888,
-    OMX_COLOR_Format32bitARGB8888,
-    OMX_COLOR_FormatYUV411Planar,
-    OMX_COLOR_FormatYUV411PackedPlanar,
-    OMX_COLOR_FormatYUV420Planar,
-    OMX_COLOR_FormatYUV420PackedPlanar,
-    OMX_COLOR_FormatYUV420SemiPlanar,
-    OMX_COLOR_FormatYUV422Planar,
-    OMX_COLOR_FormatYUV422PackedPlanar,
-    OMX_COLOR_FormatYUV422SemiPlanar,
-    OMX_COLOR_FormatYCbYCr,
-    OMX_COLOR_FormatYCrYCb,
-    OMX_COLOR_FormatCbYCrY,
-    OMX_COLOR_FormatCrYCbY,
-    OMX_COLOR_FormatYUV444Interleaved,
-    OMX_COLOR_FormatRawBayer8bit,
-    OMX_COLOR_FormatRawBayer10bit,
-    OMX_COLOR_FormatRawBayer8bitcompressed,
-    OMX_COLOR_FormatL2,
-    OMX_COLOR_FormatL4,
-    OMX_COLOR_FormatL8,
-    OMX_COLOR_FormatL16,
-    OMX_COLOR_FormatL24,
-    OMX_COLOR_FormatL32,
-    OMX_COLOR_FormatYUV420PackedSemiPlanar,
-    OMX_COLOR_FormatYUV422PackedSemiPlanar,
-    OMX_COLOR_Format18BitBGR666,
-    OMX_COLOR_Format24BitARGB6666,
-    OMX_COLOR_Format24BitABGR6666,
-    OMX_COLOR_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_COLOR_FormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    /**<Reserved android opaque colorformat. Tells the encoder that
-     * the actual colorformat will be  relayed by the
-     * Gralloc Buffers.
-     * FIXME: In the process of reserving some enum values for
-     * Android-specific OMX IL colorformats. Change this enum to
-     * an acceptable range once that is done.
-     * */
-    OMX_COLOR_FormatAndroidOpaque = 0x7F000789,
-    OMX_COLOR_Format32BitRGBA8888 = 0x7F00A000,
-    /** Flexible 8-bit YUV format.  Codec should report this format
-     *  as being supported if it supports any YUV420 packed planar
-     *  or semiplanar formats.  When port is set to use this format,
-     *  codec can substitute any YUV420 packed planar or semiplanar
-     *  format for it. */
-    OMX_COLOR_FormatYUV420Flexible = 0x7F420888,
-
-    OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = 0x7F000100,
-    OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00,
-    OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka = 0x7FA30C03,
-    OMX_SEC_COLOR_FormatNV12Tiled = 0x7FC00002,
-    OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m = 0x7FA30C04,
-    OMX_COLOR_FormatMax = 0x7FFFFFFF
-} OMX_COLOR_FORMATTYPE;
-
-
-/**
- * Defines the matrix for conversion from RGB to YUV or vice versa.
- * iColorMatrix should be initialized with the fixed point values
- * used in converting between formats.
- */
-typedef struct OMX_CONFIG_COLORCONVERSIONTYPE {
-    OMX_U32 nSize;              /**< Size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version info */
-    OMX_U32 nPortIndex;         /**< Port that this struct applies to */
-    OMX_S32 xColorMatrix[3][3]; /**< Stored in signed Q16 format */
-    OMX_S32 xColorOffset[4];    /**< Stored in signed Q16 format */
-}OMX_CONFIG_COLORCONVERSIONTYPE;
-
-
-/**
- * Structure defining percent to scale each frame dimension.  For example:
- * To make the width 50% larger, use fWidth = 1.5 and to make the width
- * 1/2 the original size, use fWidth = 0.5
- */
-typedef struct OMX_CONFIG_SCALEFACTORTYPE {
-    OMX_U32 nSize;            /**< Size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version info */
-    OMX_U32 nPortIndex;       /**< Port that this struct applies to */
-    OMX_S32 xWidth;           /**< Fixed point value stored as Q16 */
-    OMX_S32 xHeight;          /**< Fixed point value stored as Q16 */
-}OMX_CONFIG_SCALEFACTORTYPE;
-
-
-/**
- * Enumeration of possible image filter types
- */
-typedef enum OMX_IMAGEFILTERTYPE {
-    OMX_ImageFilterNone,
-    OMX_ImageFilterNoise,
-    OMX_ImageFilterEmboss,
-    OMX_ImageFilterNegative,
-    OMX_ImageFilterSketch,
-    OMX_ImageFilterOilPaint,
-    OMX_ImageFilterHatch,
-    OMX_ImageFilterGpen,
-    OMX_ImageFilterAntialias,
-    OMX_ImageFilterDeRing,
-    OMX_ImageFilterSolarize,
-    OMX_ImageFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_ImageFilterVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_ImageFilterMax = 0x7FFFFFFF
-} OMX_IMAGEFILTERTYPE;
-
-
-/**
- * Image filter configuration
- *
- * STRUCT MEMBERS:
- *  nSize        : Size of the structure in bytes
- *  nVersion     : OMX specification version information
- *  nPortIndex   : Port that this structure applies to
- *  eImageFilter : Image filter type enumeration
- */
-typedef struct OMX_CONFIG_IMAGEFILTERTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_IMAGEFILTERTYPE eImageFilter;
-} OMX_CONFIG_IMAGEFILTERTYPE;
-
-
-/**
- * Customized U and V for color enhancement
- *
- * STRUCT MEMBERS:
- *  nSize             : Size of the structure in bytes
- *  nVersion          : OMX specification version information
- *  nPortIndex        : Port that this structure applies to
- *  bColorEnhancement : Enable/disable color enhancement
- *  nCustomizedU      : Practical values: 16-240, range: 0-255, value set for
- *                      U component
- *  nCustomizedV      : Practical values: 16-240, range: 0-255, value set for
- *                      V component
- */
-typedef struct OMX_CONFIG_COLORENHANCEMENTTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bColorEnhancement;
-    OMX_U8 nCustomizedU;
-    OMX_U8 nCustomizedV;
-} OMX_CONFIG_COLORENHANCEMENTTYPE;
-
-
-/**
- * Define color key and color key mask
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nARGBColor : 32bit Alpha, Red, Green, Blue Color
- *  nARGBMask  : 32bit Mask for Alpha, Red, Green, Blue channels
- */
-typedef struct OMX_CONFIG_COLORKEYTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nARGBColor;
-    OMX_U32 nARGBMask;
-} OMX_CONFIG_COLORKEYTYPE;
-
-
-/**
- * List of color blend types for pre/post processing
- *
- * ENUMS:
- *  None          : No color blending present
- *  AlphaConstant : Function is (alpha_constant * src) +
- *                  (1 - alpha_constant) * dst)
- *  AlphaPerPixel : Function is (alpha * src) + (1 - alpha) * dst)
- *  Alternate     : Function is alternating pixels from src and dst
- *  And           : Function is (src & dst)
- *  Or            : Function is (src | dst)
- *  Invert        : Function is ~src
- */
-typedef enum OMX_COLORBLENDTYPE {
-    OMX_ColorBlendNone,
-    OMX_ColorBlendAlphaConstant,
-    OMX_ColorBlendAlphaPerPixel,
-    OMX_ColorBlendAlternate,
-    OMX_ColorBlendAnd,
-    OMX_ColorBlendOr,
-    OMX_ColorBlendInvert,
-    OMX_ColorBlendKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_ColorBlendVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_ColorBlendMax = 0x7FFFFFFF
-} OMX_COLORBLENDTYPE;
-
-
-/**
- * Color blend configuration
- *
- * STRUCT MEMBERS:
- *  nSize             : Size of the structure in bytes
- *  nVersion          : OMX specification version information
- *  nPortIndex        : Port that this structure applies to
- *  nRGBAlphaConstant : Constant global alpha values when global alpha is used
- *  eColorBlend       : Color blend type enumeration
- */
-typedef struct OMX_CONFIG_COLORBLENDTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nRGBAlphaConstant;
-    OMX_COLORBLENDTYPE  eColorBlend;
-} OMX_CONFIG_COLORBLENDTYPE;
-
-
-/**
- * Hold frame dimension
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nWidth     : Frame width in pixels
- *  nHeight    : Frame height in pixels
- */
-typedef struct OMX_FRAMESIZETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nWidth;
-    OMX_U32 nHeight;
-} OMX_FRAMESIZETYPE;
-
-
-/**
- * Rotation configuration
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nRotation  : +/- integer rotation value
- */
-typedef struct OMX_CONFIG_ROTATIONTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nRotation;
-} OMX_CONFIG_ROTATIONTYPE;
-
-
-/**
- * Possible mirroring directions for pre/post processing
- *
- * ENUMS:
- *  None       : No mirroring
- *  Vertical   : Vertical mirroring, flip on X axis
- *  Horizontal : Horizontal mirroring, flip on Y axis
- *  Both       : Both vertical and horizontal mirroring
- */
-typedef enum OMX_MIRRORTYPE {
-    OMX_MirrorNone = 0,
-    OMX_MirrorVertical,
-    OMX_MirrorHorizontal,
-    OMX_MirrorBoth,
-    OMX_MirrorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_MirrorVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_MirrorMax = 0x7FFFFFFF
-} OMX_MIRRORTYPE;
-
-
-/**
- * Mirroring configuration
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  eMirror    : Mirror type enumeration
- */
-typedef struct OMX_CONFIG_MIRRORTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_MIRRORTYPE  eMirror;
-} OMX_CONFIG_MIRRORTYPE;
-
-
-/**
- * Position information only
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nX         : X coordinate for the point
- *  nY         : Y coordinate for the point
- */
-typedef struct OMX_CONFIG_POINTTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nX;
-    OMX_S32 nY;
-} OMX_CONFIG_POINTTYPE;
-
-
-/**
- * Frame size plus position
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nLeft      : X Coordinate of the top left corner of the rectangle
- *  nTop       : Y Coordinate of the top left corner of the rectangle
- *  nWidth     : Width of the rectangle
- *  nHeight    : Height of the rectangle
- */
-typedef struct OMX_CONFIG_RECTTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nLeft;
-    OMX_S32 nTop;
-    OMX_U32 nWidth;
-    OMX_U32 nHeight;
-} OMX_CONFIG_RECTTYPE;
-
-
-/**
- * Deblocking state; it is required to be set up before starting the codec
- *
- * STRUCT MEMBERS:
- *  nSize       : Size of the structure in bytes
- *  nVersion    : OMX specification version information
- *  nPortIndex  : Port that this structure applies to
- *  bDeblocking : Enable/disable deblocking mode
- */
-typedef struct OMX_PARAM_DEBLOCKINGTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bDeblocking;
-} OMX_PARAM_DEBLOCKINGTYPE;
-
-
-/**
- * Stabilization state
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  bStab      : Enable/disable frame stabilization state
- */
-typedef struct OMX_CONFIG_FRAMESTABTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bStab;
-} OMX_CONFIG_FRAMESTABTYPE;
-
-
-/**
- * White Balance control type
- *
- * STRUCT MEMBERS:
- *  SunLight : Referenced in JSR-234
- *  Flash    : Optimal for device's integrated flash
- */
-typedef enum OMX_WHITEBALCONTROLTYPE {
-    OMX_WhiteBalControlOff = 0,
-    OMX_WhiteBalControlAuto,
-    OMX_WhiteBalControlSunLight,
-    OMX_WhiteBalControlCloudy,
-    OMX_WhiteBalControlShade,
-    OMX_WhiteBalControlTungsten,
-    OMX_WhiteBalControlFluorescent,
-    OMX_WhiteBalControlIncandescent,
-    OMX_WhiteBalControlFlash,
-    OMX_WhiteBalControlHorizon,
-    OMX_WhiteBalControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_WhiteBalControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_WhiteBalControlMax = 0x7FFFFFFF
-} OMX_WHITEBALCONTROLTYPE;
-
-
-/**
- * White Balance control configuration
- *
- * STRUCT MEMBERS:
- *  nSize            : Size of the structure in bytes
- *  nVersion         : OMX specification version information
- *  nPortIndex       : Port that this structure applies to
- *  eWhiteBalControl : White balance enumeration
- */
-typedef struct OMX_CONFIG_WHITEBALCONTROLTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_WHITEBALCONTROLTYPE eWhiteBalControl;
-} OMX_CONFIG_WHITEBALCONTROLTYPE;
-
-
-/**
- * Exposure control type
- */
-typedef enum OMX_EXPOSURECONTROLTYPE {
-    OMX_ExposureControlOff = 0,
-    OMX_ExposureControlAuto,
-    OMX_ExposureControlNight,
-    OMX_ExposureControlBackLight,
-    OMX_ExposureControlSpotLight,
-    OMX_ExposureControlSports,
-    OMX_ExposureControlSnow,
-    OMX_ExposureControlBeach,
-    OMX_ExposureControlLargeAperture,
-    OMX_ExposureControlSmallApperture,
-    OMX_ExposureControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_ExposureControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_ExposureControlMax = 0x7FFFFFFF
-} OMX_EXPOSURECONTROLTYPE;
-
-
-/**
- * White Balance control configuration
- *
- * STRUCT MEMBERS:
- *  nSize            : Size of the structure in bytes
- *  nVersion         : OMX specification version information
- *  nPortIndex       : Port that this structure applies to
- *  eExposureControl : Exposure control enumeration
- */
-typedef struct OMX_CONFIG_EXPOSURECONTROLTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_EXPOSURECONTROLTYPE eExposureControl;
-} OMX_CONFIG_EXPOSURECONTROLTYPE;
-
-
-/**
- * Defines sensor supported mode.
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nFrameRate : Single shot mode is indicated by a 0
- *  bOneShot   : Enable for single shot, disable for streaming
- *  sFrameSize : Framesize
- */
-typedef struct OMX_PARAM_SENSORMODETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nFrameRate;
-    OMX_BOOL bOneShot;
-    OMX_FRAMESIZETYPE sFrameSize;
-} OMX_PARAM_SENSORMODETYPE;
-
-
-/**
- * Defines contrast level
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nContrast  : Values allowed for contrast -100 to 100, zero means no change
- */
-typedef struct OMX_CONFIG_CONTRASTTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nContrast;
-} OMX_CONFIG_CONTRASTTYPE;
-
-
-/**
- * Defines brightness level
- *
- * STRUCT MEMBERS:
- *  nSize       : Size of the structure in bytes
- *  nVersion    : OMX specification version information
- *  nPortIndex  : Port that this structure applies to
- *  nBrightness : 0-100%
- */
-typedef struct OMX_CONFIG_BRIGHTNESSTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nBrightness;
-} OMX_CONFIG_BRIGHTNESSTYPE;
-
-
-/**
- * Defines backlight level configuration for a video sink, e.g. LCD panel
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nBacklight : Values allowed for backlight 0-100%
- *  nTimeout   : Number of milliseconds before backlight automatically turns
- *               off.  A value of 0x0 disables backight timeout
- */
-typedef struct OMX_CONFIG_BACKLIGHTTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nBacklight;
-    OMX_U32 nTimeout;
-} OMX_CONFIG_BACKLIGHTTYPE;
-
-
-/**
- * Defines setting for Gamma
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nGamma     : Values allowed for gamma -100 to 100, zero means no change
- */
-typedef struct OMX_CONFIG_GAMMATYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nGamma;
-} OMX_CONFIG_GAMMATYPE;
-
-
-/**
- * Define for setting saturation
- *
- * STRUCT MEMBERS:
- *  nSize       : Size of the structure in bytes
- *  nVersion    : OMX specification version information
- *  nPortIndex  : Port that this structure applies to
- *  nSaturation : Values allowed for saturation -100 to 100, zero means
- *                no change
- */
-typedef struct OMX_CONFIG_SATURATIONTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nSaturation;
-} OMX_CONFIG_SATURATIONTYPE;
-
-
-/**
- * Define for setting Lightness
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nLightness : Values allowed for lightness -100 to 100, zero means no
- *               change
- */
-typedef struct OMX_CONFIG_LIGHTNESSTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nLightness;
-} OMX_CONFIG_LIGHTNESSTYPE;
-
-
-/**
- * Plane blend configuration
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Index of input port associated with the plane.
- *  nDepth     : Depth of the plane in relation to the screen. Higher
- *               numbered depths are "behind" lower number depths.
- *               This number defaults to the Port Index number.
- *  nAlpha     : Transparency blending component for the entire plane.
- *               See blending modes for more detail.
- */
-typedef struct OMX_CONFIG_PLANEBLENDTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nDepth;
-    OMX_U32 nAlpha;
-} OMX_CONFIG_PLANEBLENDTYPE;
-
-
-/**
- * Define interlace type
- *
- * STRUCT MEMBERS:
- *  nSize                 : Size of the structure in bytes
- *  nVersion              : OMX specification version information
- *  nPortIndex            : Port that this structure applies to
- *  bEnable               : Enable control variable for this functionality
- *                          (see below)
- *  nInterleavePortIndex  : Index of input or output port associated with
- *                          the interleaved plane.
- *  pPlanarPortIndexes[4] : Index of input or output planar ports.
- */
-typedef struct OMX_PARAM_INTERLEAVETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bEnable;
-    OMX_U32 nInterleavePortIndex;
-} OMX_PARAM_INTERLEAVETYPE;
-
-
-/**
- * Defines the picture effect used for an input picture
- */
-typedef enum OMX_TRANSITIONEFFECTTYPE {
-    OMX_EffectNone,
-    OMX_EffectFadeFromBlack,
-    OMX_EffectFadeToBlack,
-    OMX_EffectUnspecifiedThroughConstantColor,
-    OMX_EffectDissolve,
-    OMX_EffectWipe,
-    OMX_EffectUnspecifiedMixOfTwoScenes,
-    OMX_EffectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_EffectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_EffectMax = 0x7FFFFFFF
-} OMX_TRANSITIONEFFECTTYPE;
-
-
-/**
- * Structure used to configure current transition effect
- *
- * STRUCT MEMBERS:
- * nSize      : Size of the structure in bytes
- * nVersion   : OMX specification version information
- * nPortIndex : Port that this structure applies to
- * eEffect    : Effect to enable
- */
-typedef struct OMX_CONFIG_TRANSITIONEFFECTTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_TRANSITIONEFFECTTYPE eEffect;
-} OMX_CONFIG_TRANSITIONEFFECTTYPE;
-
-
-/**
- * Defines possible data unit types for encoded video data. The data unit
- * types are used both for encoded video input for playback as well as
- * encoded video output from recording.
- */
-typedef enum OMX_DATAUNITTYPE {
-    OMX_DataUnitCodedPicture,
-    OMX_DataUnitVideoSegment,
-    OMX_DataUnitSeveralSegments,
-    OMX_DataUnitArbitraryStreamSection,
-    OMX_DataUnitKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_DataUnitVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_DataUnitMax = 0x7FFFFFFF
-} OMX_DATAUNITTYPE;
-
-
-/**
- * Defines possible encapsulation types for coded video data unit. The
- * encapsulation information is used both for encoded video input for
- * playback as well as encoded video output from recording.
- */
-typedef enum OMX_DATAUNITENCAPSULATIONTYPE {
-    OMX_DataEncapsulationElementaryStream,
-    OMX_DataEncapsulationGenericPayload,
-    OMX_DataEncapsulationRtpPayload,
-    OMX_DataEncapsulationKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_DataEncapsulationVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_DataEncapsulationMax = 0x7FFFFFFF
-} OMX_DATAUNITENCAPSULATIONTYPE;
-
-
-/**
- * Structure used to configure the type of being decoded/encoded
- */
-typedef struct OMX_PARAM_DATAUNITTYPE {
-    OMX_U32 nSize;            /**< Size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< Port that this structure applies to */
-    OMX_DATAUNITTYPE eUnitType;
-    OMX_DATAUNITENCAPSULATIONTYPE eEncapsulationType;
-} OMX_PARAM_DATAUNITTYPE;
-
-
-/**
- * Defines dither types
- */
-typedef enum OMX_DITHERTYPE {
-    OMX_DitherNone,
-    OMX_DitherOrdered,
-    OMX_DitherErrorDiffusion,
-    OMX_DitherOther,
-    OMX_DitherKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_DitherVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_DitherMax = 0x7FFFFFFF
-} OMX_DITHERTYPE;
-
-
-/**
- * Structure used to configure current type of dithering
- */
-typedef struct OMX_CONFIG_DITHERTYPE {
-    OMX_U32 nSize;            /**< Size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex;       /**< Port that this structure applies to */
-    OMX_DITHERTYPE eDither;   /**< Type of dithering to use */
-} OMX_CONFIG_DITHERTYPE;
-
-typedef struct OMX_CONFIG_CAPTUREMODETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;     /**< Port that this structure applies to */
-    OMX_BOOL bContinuous;   /**< If true then ignore frame rate and emit capture
-                             *   data as fast as possible (otherwise obey port's frame rate). */
-    OMX_BOOL bFrameLimited; /**< If true then terminate capture after the port emits the
-                             *   specified number of frames (otherwise the port does not
-                             *   terminate the capture until instructed to do so by the client).
-                             *   Even if set, the client may manually terminate the capture prior
-                             *   to reaching the limit. */
-    OMX_U32 nFrameLimit;      /**< Limit on number of frames emitted during a capture (only
-                               *   valid if bFrameLimited is set). */
-} OMX_CONFIG_CAPTUREMODETYPE;
-
-typedef enum OMX_METERINGTYPE {
-
-    OMX_MeteringModeAverage,     /**< Center-weighted average metering. */
-    OMX_MeteringModeSpot,        /**< Spot (partial) metering. */
-    OMX_MeteringModeMatrix,      /**< Matrix or evaluative metering. */
-
-    OMX_MeteringKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_MeteringVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_EVModeMax = 0x7fffffff
-} OMX_METERINGTYPE;
-
-typedef struct OMX_CONFIG_EXPOSUREVALUETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_METERINGTYPE eMetering;
-    OMX_S32 xEVCompensation;      /**< Fixed point value stored as Q16 */
-    OMX_U32 nApertureFNumber;     /**< e.g. nApertureFNumber = 2 implies "f/2" - Q16 format */
-    OMX_BOOL bAutoAperture;       /**< Whether aperture number is defined automatically */
-    OMX_U32 nShutterSpeedMsec;    /**< Shutterspeed in milliseconds */
-    OMX_BOOL bAutoShutterSpeed;   /**< Whether shutter speed is defined automatically */
-    OMX_U32 nSensitivity;         /**< e.g. nSensitivity = 100 implies "ISO 100" */
-    OMX_BOOL bAutoSensitivity;    /**< Whether sensitivity is defined automatically */
-} OMX_CONFIG_EXPOSUREVALUETYPE;
-
-/**
- * Focus region configuration
- *
- * STRUCT MEMBERS:
- *  nSize           : Size of the structure in bytes
- *  nVersion        : OMX specification version information
- *  nPortIndex      : Port that this structure applies to
- *  bCenter         : Use center region as focus region of interest
- *  bLeft           : Use left region as focus region of interest
- *  bRight          : Use right region as focus region of interest
- *  bTop            : Use top region as focus region of interest
- *  bBottom         : Use bottom region as focus region of interest
- *  bTopLeft        : Use top left region as focus region of interest
- *  bTopRight       : Use top right region as focus region of interest
- *  bBottomLeft     : Use bottom left region as focus region of interest
- *  bBottomRight    : Use bottom right region as focus region of interest
- */
-typedef struct OMX_CONFIG_FOCUSREGIONTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bCenter;
-    OMX_BOOL bLeft;
-    OMX_BOOL bRight;
-    OMX_BOOL bTop;
-    OMX_BOOL bBottom;
-    OMX_BOOL bTopLeft;
-    OMX_BOOL bTopRight;
-    OMX_BOOL bBottomLeft;
-    OMX_BOOL bBottomRight;
-} OMX_CONFIG_FOCUSREGIONTYPE;
-
-/**
- * Focus Status type
- */
-typedef enum OMX_FOCUSSTATUSTYPE {
-    OMX_FocusStatusOff = 0,
-    OMX_FocusStatusRequest,
-    OMX_FocusStatusReached,
-    OMX_FocusStatusUnableToReach,
-    OMX_FocusStatusLost,
-    OMX_FocusStatusKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_FocusStatusVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_FocusStatusMax = 0x7FFFFFFF
-} OMX_FOCUSSTATUSTYPE;
-
-/**
- * Focus status configuration
- *
- * STRUCT MEMBERS:
- *  nSize               : Size of the structure in bytes
- *  nVersion            : OMX specification version information
- *  nPortIndex          : Port that this structure applies to
- *  eFocusStatus        : Specifies the focus status
- *  bCenterStatus       : Use center region as focus region of interest
- *  bLeftStatus         : Use left region as focus region of interest
- *  bRightStatus        : Use right region as focus region of interest
- *  bTopStatus          : Use top region as focus region of interest
- *  bBottomStatus       : Use bottom region as focus region of interest
- *  bTopLeftStatus      : Use top left region as focus region of interest
- *  bTopRightStatus     : Use top right region as focus region of interest
- *  bBottomLeftStatus   : Use bottom left region as focus region of interest
- *  bBottomRightStatus  : Use bottom right region as focus region of interest
- */
-typedef struct OMX_PARAM_FOCUSSTATUSTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_FOCUSSTATUSTYPE eFocusStatus;
-    OMX_BOOL bCenterStatus;
-    OMX_BOOL bLeftStatus;
-    OMX_BOOL bRightStatus;
-    OMX_BOOL bTopStatus;
-    OMX_BOOL bBottomStatus;
-    OMX_BOOL bTopLeftStatus;
-    OMX_BOOL bTopRightStatus;
-    OMX_BOOL bBottomLeftStatus;
-    OMX_BOOL bBottomRightStatus;
-} OMX_PARAM_FOCUSSTATUSTYPE;
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
diff --git a/include/media/openmax/OMX_Image.h b/include/media/openmax/OMX_Image.h
deleted file mode 100644
index 23a0209f5d..0000000000
--- a/include/media/openmax/OMX_Image.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/**
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * @file OMX_Image.h - OpenMax IL version 1.1.2
- * The structures needed by Image components to exchange parameters and
- * configuration data with the components.
- */
-#ifndef OMX_Image_h
-#define OMX_Image_h
-
-#ifdef __cplusplus
-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_IVCommon.h>
-
-/** @defgroup imaging OpenMAX IL Imaging Domain
- * @ingroup iv
- * Structures for OpenMAX IL Imaging domain
- * @{
- */
-
-/**
- * Enumeration used to define the possible image compression coding.
- */
-typedef enum OMX_IMAGE_CODINGTYPE {
-    OMX_IMAGE_CodingUnused,      /**< Value when format is N/A */
-    OMX_IMAGE_CodingAutoDetect,  /**< Auto detection of image format */
-    OMX_IMAGE_CodingJPEG,        /**< JPEG/JFIF image format */
-    OMX_IMAGE_CodingJPEG2K,      /**< JPEG 2000 image format */
-    OMX_IMAGE_CodingEXIF,        /**< EXIF image format */
-    OMX_IMAGE_CodingTIFF,        /**< TIFF image format */
-    OMX_IMAGE_CodingGIF,         /**< Graphics image format */
-    OMX_IMAGE_CodingPNG,         /**< PNG image format */
-    OMX_IMAGE_CodingLZW,         /**< LZW image format */
-    OMX_IMAGE_CodingBMP,         /**< Windows Bitmap format */
-    OMX_IMAGE_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_IMAGE_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_IMAGE_CodingMax = 0x7FFFFFFF
-} OMX_IMAGE_CODINGTYPE;
-
-
-/**
- * Data structure used to define an image path. The number of image paths
- * for input and output will vary by type of the image component.
- *
- *  Input (aka Source) : Zero Inputs, one Output,
- *  Splitter           : One Input, 2 or more Outputs,
- *  Processing Element : One Input, one output,
- *  Mixer              : 2 or more inputs, one output,
- *  Output (aka Sink)  : One Input, zero outputs.
- *
- * The PortDefinition structure is used to define all of the parameters
- * necessary for the compliant component to setup an input or an output
- * image path.  If additional vendor specific data is required, it should
- * be transmitted to the component using the CustomCommand function.
- * Compliant components will prepopulate this structure with optimal
- * values during the OMX_GetParameter() command.
- *
- * STRUCT MEMBERS:
- *  cMIMEType             : MIME type of data for the port
- *  pNativeRender         : Platform specific reference for a display if a
- *                          sync, otherwise this field is 0
- *  nFrameWidth           : Width of frame to be used on port if
- *                          uncompressed format is used.  Use 0 for
- *                          unknown, don't care or variable
- *  nFrameHeight          : Height of frame to be used on port if
- *                          uncompressed format is used. Use 0 for
- *                          unknown, don't care or variable
- *  nStride               : Number of bytes per span of an image (i.e.
- *                          indicates the number of bytes to get from
- *                          span N to span N+1, where negative stride
- *                          indicates the image is bottom up
- *  nSliceHeight          : Height used when encoding in slices
- *  bFlagErrorConcealment : Turns on error concealment if it is supported by
- *                          the OMX component
- *  eCompressionFormat    : Compression format used in this instance of
- *                          the component. When OMX_IMAGE_CodingUnused is
- *                          specified, eColorFormat is valid
- *  eColorFormat          : Decompressed format used by this component
- *  pNativeWindow         : Platform specific reference for a window object if a
- *                          display sink , otherwise this field is 0x0.
- */
-typedef struct OMX_IMAGE_PORTDEFINITIONTYPE {
-    OMX_STRING cMIMEType;
-    OMX_NATIVE_DEVICETYPE pNativeRender;
-    OMX_U32 nFrameWidth;
-    OMX_U32 nFrameHeight;
-    OMX_S32 nStride;
-    OMX_U32 nSliceHeight;
-    OMX_BOOL bFlagErrorConcealment;
-    OMX_IMAGE_CODINGTYPE eCompressionFormat;
-    OMX_COLOR_FORMATTYPE eColorFormat;
-    OMX_NATIVE_WINDOWTYPE pNativeWindow;
-} OMX_IMAGE_PORTDEFINITIONTYPE;
-
-
-/**
- * Port format parameter.  This structure is used to enumerate the various
- * data input/output format supported by the port.
- *
- * STRUCT MEMBERS:
- *  nSize              : Size of the structure in bytes
- *  nVersion           : OMX specification version information
- *  nPortIndex         : Indicates which port to set
- *  nIndex             : Indicates the enumeration index for the format from
- *                       0x0 to N-1
- *  eCompressionFormat : Compression format used in this instance of the
- *                       component. When OMX_IMAGE_CodingUnused is specified,
- *                       eColorFormat is valid
- *  eColorFormat       : Decompressed format used by this component
- */
-typedef struct OMX_IMAGE_PARAM_PORTFORMATTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nIndex;
-    OMX_IMAGE_CODINGTYPE eCompressionFormat;
-    OMX_COLOR_FORMATTYPE eColorFormat;
-} OMX_IMAGE_PARAM_PORTFORMATTYPE;
-
-
-/**
- * Flash control type
- *
- * ENUMS
- *  Torch : Flash forced constantly on
- */
-typedef enum OMX_IMAGE_FLASHCONTROLTYPE {
-    OMX_IMAGE_FlashControlOn = 0,
-    OMX_IMAGE_FlashControlOff,
-    OMX_IMAGE_FlashControlAuto,
-    OMX_IMAGE_FlashControlRedEyeReduction,
-    OMX_IMAGE_FlashControlFillin,
-    OMX_IMAGE_FlashControlTorch,
-    OMX_IMAGE_FlashControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_IMAGE_FlashControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_IMAGE_FlashControlMax = 0x7FFFFFFF
-} OMX_IMAGE_FLASHCONTROLTYPE;
-
-
-/**
- * Flash control configuration
- *
- * STRUCT MEMBERS:
- *  nSize         : Size of the structure in bytes
- *  nVersion      : OMX specification version information
- *  nPortIndex    : Port that this structure applies to
- *  eFlashControl : Flash control type
- */
-typedef struct OMX_IMAGE_PARAM_FLASHCONTROLTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_IMAGE_FLASHCONTROLTYPE eFlashControl;
-} OMX_IMAGE_PARAM_FLASHCONTROLTYPE;
-
-
-/**
- * Focus control type
- */
-typedef enum OMX_IMAGE_FOCUSCONTROLTYPE {
-    OMX_IMAGE_FocusControlOn = 0,
-    OMX_IMAGE_FocusControlOff,
-    OMX_IMAGE_FocusControlAuto,
-    OMX_IMAGE_FocusControlAutoLock,
-    OMX_IMAGE_FocusControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_IMAGE_FocusControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_IMAGE_FocusControlMax = 0x7FFFFFFF
-} OMX_IMAGE_FOCUSCONTROLTYPE;
-
-
-/**
- * Focus control configuration
- *
- * STRUCT MEMBERS:
- *  nSize           : Size of the structure in bytes
- *  nVersion        : OMX specification version information
- *  nPortIndex      : Port that this structure applies to
- *  eFocusControl   : Focus control
- *  nFocusSteps     : Focus can take on values from 0 mm to infinity.
- *                    Interest is only in number of steps over this range.
- *  nFocusStepIndex : Current focus step index
- */
-typedef struct OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_IMAGE_FOCUSCONTROLTYPE eFocusControl;
-    OMX_U32 nFocusSteps;
-    OMX_U32 nFocusStepIndex;
-} OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE;
-
-
-/**
- * Q Factor for JPEG compression, which controls the tradeoff between image
- * quality and size.  Q Factor provides a more simple means of controlling
- * JPEG compression quality, without directly programming Quantization
- * tables for chroma and luma
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nQFactor   : JPEG Q factor value in the range of 1-100. A factor of 1
- *               produces the smallest, worst quality images, and a factor
- *               of 100 produces the largest, best quality images.  A
- *               typical default is 75 for small good quality images
- */
-typedef struct OMX_IMAGE_PARAM_QFACTORTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nQFactor;
-} OMX_IMAGE_PARAM_QFACTORTYPE;
-
-/**
- * Quantization table type
- */
-
-typedef enum OMX_IMAGE_QUANTIZATIONTABLETYPE {
-    OMX_IMAGE_QuantizationTableLuma = 0,
-    OMX_IMAGE_QuantizationTableChroma,
-    OMX_IMAGE_QuantizationTableChromaCb,
-    OMX_IMAGE_QuantizationTableChromaCr,
-    OMX_IMAGE_QuantizationTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_IMAGE_QuantizationTableVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_IMAGE_QuantizationTableMax = 0x7FFFFFFF
-} OMX_IMAGE_QUANTIZATIONTABLETYPE;
-
-/**
- * JPEG quantization tables are used to determine DCT compression for
- * YUV data, as an alternative to specifying Q factor, providing exact
- * control of compression
- *
- * STRUCT MEMBERS:
- *  nSize                   : Size of the structure in bytes
- *  nVersion                : OMX specification version information
- *  nPortIndex              : Port that this structure applies to
- *  eQuantizationTable      : Quantization table type
- *  nQuantizationMatrix[64] : JPEG quantization table of coefficients stored
- *                            in increasing columns then by rows of data (i.e.
- *                            row 1, ... row 8). Quantization values are in
- *                            the range 0-255 and stored in linear order
- *                            (i.e. the component will zig-zag the
- *                            quantization table data if required internally)
- */
-typedef struct OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_IMAGE_QUANTIZATIONTABLETYPE eQuantizationTable;
-    OMX_U8 nQuantizationMatrix[64];
-} OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE;
-
-
-/**
- * Huffman table type, the same Huffman table is applied for chroma and
- * luma component
- */
-typedef enum OMX_IMAGE_HUFFMANTABLETYPE {
-    OMX_IMAGE_HuffmanTableAC = 0,
-    OMX_IMAGE_HuffmanTableDC,
-    OMX_IMAGE_HuffmanTableACLuma,
-    OMX_IMAGE_HuffmanTableACChroma,
-    OMX_IMAGE_HuffmanTableDCLuma,
-    OMX_IMAGE_HuffmanTableDCChroma,
-    OMX_IMAGE_HuffmanTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_IMAGE_HuffmanTableVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_IMAGE_HuffmanTableMax = 0x7FFFFFFF
-} OMX_IMAGE_HUFFMANTABLETYPE;
-
-/**
- * JPEG Huffman table
- *
- * STRUCT MEMBERS:
- *  nSize                            : Size of the structure in bytes
- *  nVersion                         : OMX specification version information
- *  nPortIndex                       : Port that this structure applies to
- *  eHuffmanTable                    : Huffman table type
- *  nNumberOfHuffmanCodeOfLength[16] : 0-16, number of Huffman codes of each
- *                                     possible length
- *  nHuffmanTable[256]               : 0-255, the size used for AC and DC
- *                                     HuffmanTable are 16 and 162
- */
-typedef struct OMX_IMAGE_PARAM_HUFFMANTTABLETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_IMAGE_HUFFMANTABLETYPE eHuffmanTable;
-    OMX_U8 nNumberOfHuffmanCodeOfLength[16];
-    OMX_U8 nHuffmanTable[256];
-}OMX_IMAGE_PARAM_HUFFMANTTABLETYPE;
-
-/** @} */
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
diff --git a/include/media/openmax/OMX_Index.h b/include/media/openmax/OMX_Index.h
deleted file mode 100644
index 5be1355a96..0000000000
--- a/include/media/openmax/OMX_Index.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** @file OMX_Index.h - OpenMax IL version 1.1.2
- *  The OMX_Index header file contains the definitions for both applications
- *  and components .
- */
-
-
-#ifndef OMX_Index_h
-#define OMX_Index_h
-
-#ifdef __cplusplus
-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
- *  OMX_GetParameter, OMX_SetParameter, OMX_GetConfig or OMX_SetConfig methods
- *  are used, the second parameter will always be an entry from this enumeration
- *  and the third entry will be the structure shown in the comments for the entry.
- *  For example, if the application is initializing a cropping function, the
- *  OMX_SetConfig command would have OMX_IndexConfigCommonInputCrop as the second parameter
- *  and would send a pointer to an initialized OMX_RECTTYPE structure as the
- *  third parameter.
- *
- *  The enumeration entries named with the OMX_Config prefix are sent using
- *  the OMX_SetConfig command and the enumeration entries named with the
- *  OMX_PARAM_ prefix are sent using the OMX_SetParameter command.
- */
-typedef enum OMX_INDEXTYPE {
-
-    OMX_IndexComponentStartUnused = 0x01000000,
-    OMX_IndexParamPriorityMgmt,             /**< reference: OMX_PRIORITYMGMTTYPE */
-    OMX_IndexParamAudioInit,                /**< reference: OMX_PORT_PARAM_TYPE */
-    OMX_IndexParamImageInit,                /**< reference: OMX_PORT_PARAM_TYPE */
-    OMX_IndexParamVideoInit,                /**< reference: OMX_PORT_PARAM_TYPE */
-    OMX_IndexParamOtherInit,                /**< reference: OMX_PORT_PARAM_TYPE */
-    OMX_IndexParamNumAvailableStreams,      /**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexParamActiveStream,             /**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexParamSuspensionPolicy,         /**< reference: OMX_PARAM_SUSPENSIONPOLICYTYPE */
-    OMX_IndexParamComponentSuspended,       /**< reference: OMX_PARAM_SUSPENSIONTYPE */
-    OMX_IndexConfigCapturing,               /**< reference: OMX_CONFIG_BOOLEANTYPE */
-    OMX_IndexConfigCaptureMode,             /**< reference: OMX_CONFIG_CAPTUREMODETYPE */
-    OMX_IndexAutoPauseAfterCapture,         /**< reference: OMX_CONFIG_BOOLEANTYPE */
-    OMX_IndexParamContentURI,               /**< reference: OMX_PARAM_CONTENTURITYPE */
-    OMX_IndexParamCustomContentPipe,        /**< reference: OMX_PARAM_CONTENTPIPETYPE */
-    OMX_IndexParamDisableResourceConcealment, /**< reference: OMX_RESOURCECONCEALMENTTYPE */
-    OMX_IndexConfigMetadataItemCount,       /**< reference: OMX_CONFIG_METADATAITEMCOUNTTYPE */
-    OMX_IndexConfigContainerNodeCount,      /**< reference: OMX_CONFIG_CONTAINERNODECOUNTTYPE */
-    OMX_IndexConfigMetadataItem,            /**< reference: OMX_CONFIG_METADATAITEMTYPE */
-    OMX_IndexConfigCounterNodeID,           /**< reference: OMX_CONFIG_CONTAINERNODEIDTYPE */
-    OMX_IndexParamMetadataFilterType,       /**< reference: OMX_PARAM_METADATAFILTERTYPE */
-    OMX_IndexParamMetadataKeyFilter,        /**< reference: OMX_PARAM_METADATAFILTERTYPE */
-    OMX_IndexConfigPriorityMgmt,            /**< reference: OMX_PRIORITYMGMTTYPE */
-    OMX_IndexParamStandardComponentRole,    /**< reference: OMX_PARAM_COMPONENTROLETYPE */
-    OMX_IndexComponentEndUnused,
-
-    OMX_IndexPortStartUnused = 0x02000000,
-    OMX_IndexParamPortDefinition,           /**< reference: OMX_PARAM_PORTDEFINITIONTYPE */
-    OMX_IndexParamCompBufferSupplier,       /**< reference: OMX_PARAM_BUFFERSUPPLIERTYPE */
-    OMX_IndexPortEndUnused,
-
-    OMX_IndexReservedStartUnused = 0x03000000,
-
-    /* Audio parameters and configurations */
-    OMX_IndexAudioStartUnused = 0x04000000,
-    OMX_IndexParamAudioPortFormat,          /**< reference: OMX_AUDIO_PARAM_PORTFORMATTYPE */
-    OMX_IndexParamAudioPcm,                 /**< reference: OMX_AUDIO_PARAM_PCMMODETYPE */
-    OMX_IndexParamAudioAac,                 /**< reference: OMX_AUDIO_PARAM_AACPROFILETYPE */
-    OMX_IndexParamAudioRa,                  /**< reference: OMX_AUDIO_PARAM_RATYPE */
-    OMX_IndexParamAudioMp3,                 /**< reference: OMX_AUDIO_PARAM_MP3TYPE */
-    OMX_IndexParamAudioAdpcm,               /**< reference: OMX_AUDIO_PARAM_ADPCMTYPE */
-    OMX_IndexParamAudioG723,                /**< reference: OMX_AUDIO_PARAM_G723TYPE */
-    OMX_IndexParamAudioG729,                /**< reference: OMX_AUDIO_PARAM_G729TYPE */
-    OMX_IndexParamAudioAmr,                 /**< reference: OMX_AUDIO_PARAM_AMRTYPE */
-    OMX_IndexParamAudioWma,                 /**< reference: OMX_AUDIO_PARAM_WMATYPE */
-    OMX_IndexParamAudioSbc,                 /**< reference: OMX_AUDIO_PARAM_SBCTYPE */
-    OMX_IndexParamAudioMidi,                /**< reference: OMX_AUDIO_PARAM_MIDITYPE */
-    OMX_IndexParamAudioGsm_FR,              /**< reference: OMX_AUDIO_PARAM_GSMFRTYPE */
-    OMX_IndexParamAudioMidiLoadUserSound,   /**< reference: OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE */
-    OMX_IndexParamAudioG726,                /**< reference: OMX_AUDIO_PARAM_G726TYPE */
-    OMX_IndexParamAudioGsm_EFR,             /**< reference: OMX_AUDIO_PARAM_GSMEFRTYPE */
-    OMX_IndexParamAudioGsm_HR,              /**< reference: OMX_AUDIO_PARAM_GSMHRTYPE */
-    OMX_IndexParamAudioPdc_FR,              /**< reference: OMX_AUDIO_PARAM_PDCFRTYPE */
-    OMX_IndexParamAudioPdc_EFR,             /**< reference: OMX_AUDIO_PARAM_PDCEFRTYPE */
-    OMX_IndexParamAudioPdc_HR,              /**< reference: OMX_AUDIO_PARAM_PDCHRTYPE */
-    OMX_IndexParamAudioTdma_FR,             /**< reference: OMX_AUDIO_PARAM_TDMAFRTYPE */
-    OMX_IndexParamAudioTdma_EFR,            /**< reference: OMX_AUDIO_PARAM_TDMAEFRTYPE */
-    OMX_IndexParamAudioQcelp8,              /**< reference: OMX_AUDIO_PARAM_QCELP8TYPE */
-    OMX_IndexParamAudioQcelp13,             /**< reference: OMX_AUDIO_PARAM_QCELP13TYPE */
-    OMX_IndexParamAudioEvrc,                /**< reference: OMX_AUDIO_PARAM_EVRCTYPE */
-    OMX_IndexParamAudioSmv,                 /**< reference: OMX_AUDIO_PARAM_SMVTYPE */
-    OMX_IndexParamAudioVorbis,              /**< reference: OMX_AUDIO_PARAM_VORBISTYPE */
-    OMX_IndexParamAudioFlac,                /**< reference: OMX_AUDIO_PARAM_FLACTYPE */
-    OMX_IndexAudioEndUnused,
-
-    OMX_IndexConfigAudioMidiImmediateEvent, /**< reference: OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE */
-    OMX_IndexConfigAudioMidiControl,        /**< reference: OMX_AUDIO_CONFIG_MIDICONTROLTYPE */
-    OMX_IndexConfigAudioMidiSoundBankProgram, /**< reference: OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE */
-    OMX_IndexConfigAudioMidiStatus,         /**< reference: OMX_AUDIO_CONFIG_MIDISTATUSTYPE */
-    OMX_IndexConfigAudioMidiMetaEvent,      /**< reference: OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE */
-    OMX_IndexConfigAudioMidiMetaEventData,  /**< reference: OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE */
-    OMX_IndexConfigAudioVolume,             /**< reference: OMX_AUDIO_CONFIG_VOLUMETYPE */
-    OMX_IndexConfigAudioBalance,            /**< reference: OMX_AUDIO_CONFIG_BALANCETYPE */
-    OMX_IndexConfigAudioChannelMute,        /**< reference: OMX_AUDIO_CONFIG_CHANNELMUTETYPE */
-    OMX_IndexConfigAudioMute,               /**< reference: OMX_AUDIO_CONFIG_MUTETYPE */
-    OMX_IndexConfigAudioLoudness,           /**< reference: OMX_AUDIO_CONFIG_LOUDNESSTYPE */
-    OMX_IndexConfigAudioEchoCancelation,    /**< reference: OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE */
-    OMX_IndexConfigAudioNoiseReduction,     /**< reference: OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE */
-    OMX_IndexConfigAudioBass,               /**< reference: OMX_AUDIO_CONFIG_BASSTYPE */
-    OMX_IndexConfigAudioTreble,             /**< reference: OMX_AUDIO_CONFIG_TREBLETYPE */
-    OMX_IndexConfigAudioStereoWidening,     /**< reference: OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE */
-    OMX_IndexConfigAudioChorus,             /**< reference: OMX_AUDIO_CONFIG_CHORUSTYPE */
-    OMX_IndexConfigAudioEqualizer,          /**< reference: OMX_AUDIO_CONFIG_EQUALIZERTYPE */
-    OMX_IndexConfigAudioReverberation,      /**< reference: OMX_AUDIO_CONFIG_REVERBERATIONTYPE */
-    OMX_IndexConfigAudioChannelVolume,      /**< reference: OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE */
-
-    /* Image specific parameters and configurations */
-    OMX_IndexImageStartUnused = 0x05000000,
-    OMX_IndexParamImagePortFormat,          /**< reference: OMX_IMAGE_PARAM_PORTFORMATTYPE */
-    OMX_IndexParamFlashControl,             /**< reference: OMX_IMAGE_PARAM_FLASHCONTROLTYPE */
-    OMX_IndexConfigFocusControl,            /**< reference: OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE */
-    OMX_IndexParamQFactor,                  /**< reference: OMX_IMAGE_PARAM_QFACTORTYPE */
-    OMX_IndexParamQuantizationTable,        /**< reference: OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE */
-    OMX_IndexParamHuffmanTable,             /**< reference: OMX_IMAGE_PARAM_HUFFMANTTABLETYPE */
-    OMX_IndexConfigFlashControl,            /**< reference: OMX_IMAGE_PARAM_FLASHCONTROLTYPE */
-
-    /* Video specific parameters and configurations */
-    OMX_IndexVideoStartUnused = 0x06000000,
-    OMX_IndexParamVideoPortFormat,          /**< reference: OMX_VIDEO_PARAM_PORTFORMATTYPE */
-    OMX_IndexParamVideoQuantization,        /**< reference: OMX_VIDEO_PARAM_QUANTIZATIONTYPE */
-    OMX_IndexParamVideoFastUpdate,          /**< reference: OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE */
-    OMX_IndexParamVideoBitrate,             /**< reference: OMX_VIDEO_PARAM_BITRATETYPE */
-    OMX_IndexParamVideoMotionVector,        /**< reference: OMX_VIDEO_PARAM_MOTIONVECTORTYPE */
-    OMX_IndexParamVideoIntraRefresh,        /**< reference: OMX_VIDEO_PARAM_INTRAREFRESHTYPE */
-    OMX_IndexParamVideoErrorCorrection,     /**< reference: OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE */
-    OMX_IndexParamVideoVBSMC,               /**< reference: OMX_VIDEO_PARAM_VBSMCTYPE */
-    OMX_IndexParamVideoMpeg2,               /**< reference: OMX_VIDEO_PARAM_MPEG2TYPE */
-    OMX_IndexParamVideoMpeg4,               /**< reference: OMX_VIDEO_PARAM_MPEG4TYPE */
-    OMX_IndexParamVideoWmv,                 /**< reference: OMX_VIDEO_PARAM_WMVTYPE */
-    OMX_IndexParamVideoRv,                  /**< reference: OMX_VIDEO_PARAM_RVTYPE */
-    OMX_IndexParamVideoAvc,                 /**< reference: OMX_VIDEO_PARAM_AVCTYPE */
-    OMX_IndexParamVideoH263,                /**< reference: OMX_VIDEO_PARAM_H263TYPE */
-    OMX_IndexParamVideoProfileLevelQuerySupported, /**< reference: OMX_VIDEO_PARAM_PROFILELEVELTYPE */
-    OMX_IndexParamVideoProfileLevelCurrent, /**< reference: OMX_VIDEO_PARAM_PROFILELEVELTYPE */
-    OMX_IndexConfigVideoBitrate,            /**< reference: OMX_VIDEO_CONFIG_BITRATETYPE */
-    OMX_IndexConfigVideoFramerate,          /**< reference: OMX_CONFIG_FRAMERATETYPE */
-    OMX_IndexConfigVideoIntraVOPRefresh,    /**< reference: OMX_CONFIG_INTRAREFRESHVOPTYPE */
-    OMX_IndexConfigVideoIntraMBRefresh,     /**< reference: OMX_CONFIG_MACROBLOCKERRORMAPTYPE */
-    OMX_IndexConfigVideoMBErrorReporting,   /**< reference: OMX_CONFIG_MBERRORREPORTINGTYPE */
-    OMX_IndexParamVideoMacroblocksPerFrame, /**< reference: OMX_PARAM_MACROBLOCKSTYPE */
-    OMX_IndexConfigVideoMacroBlockErrorMap, /**< reference: OMX_CONFIG_MACROBLOCKERRORMAPTYPE */
-    OMX_IndexParamVideoSliceFMO,            /**< reference: OMX_VIDEO_PARAM_AVCSLICEFMO */
-    OMX_IndexConfigVideoAVCIntraPeriod,     /**< reference: OMX_VIDEO_CONFIG_AVCINTRAPERIOD */
-    OMX_IndexConfigVideoNalSize,            /**< reference: OMX_VIDEO_CONFIG_NALSIZE */
-    OMX_IndexVideoEndUnused,
-
-    /* Image & Video common Configurations */
-    OMX_IndexCommonStartUnused = 0x07000000,
-    OMX_IndexParamCommonDeblocking,         /**< reference: OMX_PARAM_DEBLOCKINGTYPE */
-    OMX_IndexParamCommonSensorMode,         /**< reference: OMX_PARAM_SENSORMODETYPE */
-    OMX_IndexParamCommonInterleave,         /**< reference: OMX_PARAM_INTERLEAVETYPE */
-    OMX_IndexConfigCommonColorFormatConversion, /**< reference: OMX_CONFIG_COLORCONVERSIONTYPE */
-    OMX_IndexConfigCommonScale,             /**< reference: OMX_CONFIG_SCALEFACTORTYPE */
-    OMX_IndexConfigCommonImageFilter,       /**< reference: OMX_CONFIG_IMAGEFILTERTYPE */
-    OMX_IndexConfigCommonColorEnhancement,  /**< reference: OMX_CONFIG_COLORENHANCEMENTTYPE */
-    OMX_IndexConfigCommonColorKey,          /**< reference: OMX_CONFIG_COLORKEYTYPE */
-    OMX_IndexConfigCommonColorBlend,        /**< reference: OMX_CONFIG_COLORBLENDTYPE */
-    OMX_IndexConfigCommonFrameStabilisation,/**< reference: OMX_CONFIG_FRAMESTABTYPE */
-    OMX_IndexConfigCommonRotate,            /**< reference: OMX_CONFIG_ROTATIONTYPE */
-    OMX_IndexConfigCommonMirror,            /**< reference: OMX_CONFIG_MIRRORTYPE */
-    OMX_IndexConfigCommonOutputPosition,    /**< reference: OMX_CONFIG_POINTTYPE */
-    OMX_IndexConfigCommonInputCrop,         /**< reference: OMX_CONFIG_RECTTYPE */
-    OMX_IndexConfigCommonOutputCrop,        /**< reference: OMX_CONFIG_RECTTYPE */
-    OMX_IndexConfigCommonDigitalZoom,       /**< reference: OMX_CONFIG_SCALEFACTORTYPE */
-    OMX_IndexConfigCommonOpticalZoom,       /**< reference: OMX_CONFIG_SCALEFACTORTYPE*/
-    OMX_IndexConfigCommonWhiteBalance,      /**< reference: OMX_CONFIG_WHITEBALCONTROLTYPE */
-    OMX_IndexConfigCommonExposure,          /**< reference: OMX_CONFIG_EXPOSURECONTROLTYPE */
-    OMX_IndexConfigCommonContrast,          /**< reference: OMX_CONFIG_CONTRASTTYPE */
-    OMX_IndexConfigCommonBrightness,        /**< reference: OMX_CONFIG_BRIGHTNESSTYPE */
-    OMX_IndexConfigCommonBacklight,         /**< reference: OMX_CONFIG_BACKLIGHTTYPE */
-    OMX_IndexConfigCommonGamma,             /**< reference: OMX_CONFIG_GAMMATYPE */
-    OMX_IndexConfigCommonSaturation,        /**< reference: OMX_CONFIG_SATURATIONTYPE */
-    OMX_IndexConfigCommonLightness,         /**< reference: OMX_CONFIG_LIGHTNESSTYPE */
-    OMX_IndexConfigCommonExclusionRect,     /**< reference: OMX_CONFIG_RECTTYPE */
-    OMX_IndexConfigCommonDithering,         /**< reference: OMX_CONFIG_DITHERTYPE */
-    OMX_IndexConfigCommonPlaneBlend,        /**< reference: OMX_CONFIG_PLANEBLENDTYPE */
-    OMX_IndexConfigCommonExposureValue,     /**< reference: OMX_CONFIG_EXPOSUREVALUETYPE */
-    OMX_IndexConfigCommonOutputSize,        /**< reference: OMX_FRAMESIZETYPE */
-    OMX_IndexParamCommonExtraQuantData,     /**< reference: OMX_OTHER_EXTRADATATYPE */
-    OMX_IndexConfigCommonFocusRegion,       /**< reference: OMX_CONFIG_FOCUSREGIONTYPE */
-    OMX_IndexConfigCommonFocusStatus,       /**< reference: OMX_PARAM_FOCUSSTATUSTYPE */
-    OMX_IndexConfigCommonTransitionEffect,  /**< reference: OMX_CONFIG_TRANSITIONEFFECTTYPE */
-    OMX_IndexCommonEndUnused,
-
-    /* Reserved Configuration range */
-    OMX_IndexOtherStartUnused = 0x08000000,
-    OMX_IndexParamOtherPortFormat,          /**< reference: OMX_OTHER_PARAM_PORTFORMATTYPE */
-    OMX_IndexConfigOtherPower,              /**< reference: OMX_OTHER_CONFIG_POWERTYPE */
-    OMX_IndexConfigOtherStats,              /**< reference: OMX_OTHER_CONFIG_STATSTYPE */
-
-
-    /* Reserved Time range */
-    OMX_IndexTimeStartUnused = 0x09000000,
-    OMX_IndexConfigTimeScale,               /**< reference: OMX_TIME_CONFIG_SCALETYPE */
-    OMX_IndexConfigTimeClockState,          /**< reference: OMX_TIME_CONFIG_CLOCKSTATETYPE */
-    OMX_IndexConfigTimeActiveRefClock,      /**< reference: OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE */
-    OMX_IndexConfigTimeCurrentMediaTime,    /**< reference: OMX_TIME_CONFIG_TIMESTAMPTYPE (read only) */
-    OMX_IndexConfigTimeCurrentWallTime,     /**< reference: OMX_TIME_CONFIG_TIMESTAMPTYPE (read only) */
-    OMX_IndexConfigTimeCurrentAudioReference, /**< reference: OMX_TIME_CONFIG_TIMESTAMPTYPE (write only) */
-    OMX_IndexConfigTimeCurrentVideoReference, /**< reference: OMX_TIME_CONFIG_TIMESTAMPTYPE (write only) */
-    OMX_IndexConfigTimeMediaTimeRequest,    /**< reference: OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE (write only) */
-    OMX_IndexConfigTimeClientStartTime,     /**<reference:  OMX_TIME_CONFIG_TIMESTAMPTYPE (write only) */
-    OMX_IndexConfigTimePosition,            /**< reference: OMX_TIME_CONFIG_TIMESTAMPTYPE */
-    OMX_IndexConfigTimeSeekMode,            /**< reference: OMX_TIME_CONFIG_SEEKMODETYPE */
-
-
-    OMX_IndexKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    /* Vendor specific area */
-    OMX_IndexVendorStartUnused = 0x7F000000,
-    /* Vendor specific structures should be in the range of 0x7F000000
-       to 0x7FFFFFFE.  This range is not broken out by vendor, so
-       private indexes are not guaranteed unique and therefore should
-       only be sent to the appropriate component. */
-
-    OMX_IndexMax = 0x7FFFFFFF
-
-} OMX_INDEXTYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
diff --git a/include/media/openmax/OMX_IndexExt.h b/include/media/openmax/OMX_IndexExt.h
deleted file mode 100644
index 5a029d0a4b..0000000000
--- a/include/media/openmax/OMX_IndexExt.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2010 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** @file OMX_IndexExt.h - OpenMax IL version 1.1.2
- * The OMX_IndexExt header file contains extensions to the definitions
- * for both applications and components .
- */
-
-#ifndef OMX_IndexExt_h
-#define OMX_IndexExt_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Each OMX header shall 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_Index.h>
-
-
-/** Khronos standard extension indices.
-
-This enum lists the current Khronos extension indices to OpenMAX IL.
-*/
-typedef enum OMX_INDEXEXTTYPE {
-
-    /* Component parameters and configurations */
-    OMX_IndexExtComponentStartUnused = OMX_IndexKhronosExtensions + 0x00100000,
-    OMX_IndexConfigCallbackRequest,                 /**< reference: OMX_CONFIG_CALLBACKREQUESTTYPE */
-    OMX_IndexConfigCommitMode,                      /**< reference: OMX_CONFIG_COMMITMODETYPE */
-    OMX_IndexConfigCommit,                          /**< reference: OMX_CONFIG_COMMITTYPE */
-    OMX_IndexConfigAndroidVendorExtension,          /**< reference: OMX_CONFIG_VENDOR_EXTENSIONTYPE */
-
-    /* Port parameters and configurations */
-    OMX_IndexExtPortStartUnused = OMX_IndexKhronosExtensions + 0x00200000,
-
-    /* Audio parameters and configurations */
-    OMX_IndexExtAudioStartUnused = OMX_IndexKhronosExtensions + 0x00400000,
-    OMX_IndexParamAudioAndroidAc3,                  /**< reference: OMX_AUDIO_PARAM_ANDROID_AC3TYPE */
-    OMX_IndexParamAudioAndroidOpus,                 /**< reference: OMX_AUDIO_PARAM_ANDROID_OPUSTYPE */
-    OMX_IndexParamAudioAndroidAacPresentation,      /**< reference: OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE */
-    OMX_IndexParamAudioAndroidEac3,                 /**< reference: OMX_AUDIO_PARAM_ANDROID_EAC3TYPE */
-    OMX_IndexParamAudioProfileQuerySupported,       /**< reference: OMX_AUDIO_PARAM_ANDROID_PROFILETYPE */
-    OMX_IndexExtAudioEndUnused,
-
-    /* Image parameters and configurations */
-    OMX_IndexExtImageStartUnused = OMX_IndexKhronosExtensions + 0x00500000,
-
-    /* Video parameters and configurations */
-    OMX_IndexExtVideoStartUnused = OMX_IndexKhronosExtensions + 0x00600000,
-    OMX_IndexParamNalStreamFormatSupported,         /**< reference: OMX_NALSTREAMFORMATTYPE */
-    OMX_IndexParamNalStreamFormat,                  /**< reference: OMX_NALSTREAMFORMATTYPE */
-    OMX_IndexParamNalStreamFormatSelect,            /**< reference: OMX_NALSTREAMFORMATTYPE */
-    OMX_IndexParamVideoVp8,                         /**< reference: OMX_VIDEO_PARAM_VP8TYPE */
-    OMX_IndexConfigVideoVp8ReferenceFrame,          /**< reference: OMX_VIDEO_VP8REFERENCEFRAMETYPE */
-    OMX_IndexConfigVideoVp8ReferenceFrameType,      /**< reference: OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE */
-    OMX_IndexParamVideoAndroidVp8Encoder,           /**< reference: OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE */
-    OMX_IndexParamVideoHevc,                        /**< reference: OMX_VIDEO_PARAM_HEVCTYPE */
-    OMX_IndexParamSliceSegments,                    /**< reference: OMX_VIDEO_SLICESEGMENTSTYPE */
-    OMX_IndexConfigAndroidIntraRefresh,             /**< reference: OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE */
-    OMX_IndexParamAndroidVideoTemporalLayering,     /**< reference: OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE */
-    OMX_IndexConfigAndroidVideoTemporalLayering,    /**< reference: OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE */
-    OMX_IndexParamMaxFrameDurationForBitrateControl,/**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexParamVideoVp9,                         /**< reference: OMX_VIDEO_PARAM_VP9TYPE */
-    OMX_IndexParamVideoAndroidVp9Encoder,           /**< reference: OMX_VIDEO_PARAM_ANDROID_VP9ENCODERTYPE */
-    OMX_IndexExtVideoEndUnused,
-
-    /* Image & Video common configurations */
-    OMX_IndexExtCommonStartUnused = OMX_IndexKhronosExtensions + 0x00700000,
-
-    /* Other configurations */
-    OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000,
-    OMX_IndexConfigAutoFramerateConversion,         /**< reference: OMX_CONFIG_BOOLEANTYPE */
-    OMX_IndexConfigPriority,                        /**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexConfigOperatingRate,                   /**< reference: OMX_PARAM_U32TYPE in Q16 format for video and in Hz for audio */
-    OMX_IndexParamConsumerUsageBits,                /**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexConfigLatency,                         /**< reference: OMX_PARAM_U32TYPE */
-    OMX_IndexExtOtherEndUnused,
-
-    /* Time configurations */
-    OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,
-
-    OMX_IndexExtMax = 0x7FFFFFFF
-} OMX_INDEXEXTTYPE;
-
-#define OMX_MAX_STRINGVALUE_SIZE OMX_MAX_STRINGNAME_SIZE
-#define OMX_MAX_ANDROID_VENDOR_PARAMCOUNT 32
-
-typedef enum OMX_ANDROID_VENDOR_VALUETYPE {
-    OMX_AndroidVendorValueInt32 = 0,   /*<< int32_t value */
-    OMX_AndroidVendorValueInt64,       /*<< int64_t value */
-    OMX_AndroidVendorValueString,      /*<< string value */
-    OMX_AndroidVendorValueEndUnused,
-} OMX_ANDROID_VENDOR_VALUETYPE;
-
-/**
- * Structure describing a single value of an Android vendor extension.
- *
- * STRUCTURE MEMBERS:
- *  cKey        : parameter value name.
- *  eValueType  : parameter value type
- *  bSet        : if false, the parameter is not set (for OMX_GetConfig) or is unset (OMX_SetConfig)
- *                if true, the parameter is set to the corresponding value below
- *  nInt64      : int64 value
- *  cString     : string value
- */
-typedef struct OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE {
-    OMX_U8 cKey[OMX_MAX_STRINGNAME_SIZE];
-    OMX_ANDROID_VENDOR_VALUETYPE eValueType;
-    OMX_BOOL bSet;
-    union {
-        OMX_S32 nInt32;
-        OMX_S64 nInt64;
-        OMX_U8 cString[OMX_MAX_STRINGVALUE_SIZE];
-    };
-} OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE;
-
-/**
- * OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE is the structure for an Android vendor extension
- * supported by the component. This structure enumerates the various extension parameters and their
- * values.
- *
- * Android vendor extensions have a name and one or more parameter values - each with a string key -
- * that are set together. The values are exposed to Android applications via a string key that is
- * the concatenation of 'vendor', the extension name and the parameter key, each separated by dot
- * (.), with any trailing '.value' suffix(es) removed (though optionally allowed).
- *
- * Extension names and parameter keys are subject to the following rules:
- *   - Each SHALL contain a set of lowercase alphanumeric (underscore allowed) tags separated by
- *     dot (.) or dash (-).
- *   - The first character of the first tag, and any tag following a dot SHALL not start with a
- *     digit.
- *   - Tags 'value', 'vendor', 'omx' and 'android' (even if trailed and/or followed by any number
- *     of underscores) are prohibited in the extension name.
- *   - Tags 'vendor', 'omx' and 'android' (even if trailed and/or followed by any number
- *     of underscores) are prohibited in parameter keys.
- *   - The tag 'value' (even if trailed and/or followed by any number
- *     of underscores) is prohibited in parameter keys with the following exception:
- *     the parameter key may be exactly 'value'
- *   - The parameter key for extensions with a single parameter value SHALL be 'value'
- *   - No two extensions SHALL have the same name
- *   - No extension's name SHALL start with another extension's NAME followed by a dot (.)
- *   - No two parameters of an extension SHALL have the same key
- *
- * This config can be used with both OMX_GetConfig and OMX_SetConfig. In the OMX_GetConfig
- * case, the caller specifies nIndex and nParamSizeUsed. The component fills in cName,
- * eDir and nParamCount. Additionally, if nParamSizeUsed is not less than nParamCount, the
- * component fills out the parameter values (nParam) with the current values for each parameter
- * of the vendor extension.
- *
- * The value of nIndex goes from 0 to N-1, where N is the number of Android vendor extensions
- * supported by the component. The component does not need to report N as the caller can determine
- * N by enumerating all extensions supported by the component. The component may not support any
- * extensions. If there are no more extensions, OMX_GetParameter returns OMX_ErrorNoMore. The
- * component supplies extensions in the order it wants clients to set them.
- *
- * The component SHALL return OMX_ErrorNone for all cases where nIndex is less than N (specifically
- * even in the case of where nParamCount is greater than nParamSizeUsed).
- *
- * In the OMX_SetConfig case the field nIndex is ignored. If the component supports an Android
- * vendor extension with the name in cName, it SHALL configure the parameter values for that
- * extension according to the parameters in nParam. nParamCount is the number of valid parameters
- * in the nParam array, and nParamSizeUsed is the size of the nParam array. (nParamSizeUsed
- * SHALL be at least nParamCount) Parameters that are part of a vendor extension but are not
- * in the nParam array are assumed to be unset (this is different from not changed).
- * All parameter values SHALL have distinct keys in nParam (the component can assume that this
- * is the case. Otherwise, the actual value for the parameters that are multiply defined can
- * be any of the set values.)
- *
- * Return values in case of OMX_SetConfig:
- *   OMX_ErrorUnsupportedIndex: the component does not support the extension specified by cName
- *   OMX_ErrorUnsupportedSetting: the component does not support some or any of the parameters
- *       (names) specified in nParam
- *   OMX_ErrorBadParameter: the parameter is invalid (e.g. nParamCount is greater than
- *       nParamSizeUsed, or some parameter value has invalid type)
- *
- * STRUCTURE MEMBERS:
- *  nSize       : size of the structure in bytes
- *  nVersion    : OMX specification version information
- *  cName       : name of vendor extension
- *  nParamCount : the number of parameter values that are part of this vendor extension
- *  nParamSizeUsed : the size of nParam
- *                (must be at least 1 and at most OMX_MAX_ANDROID_VENDOR_PARAMCOUNT)
- *  param       : the parameter values
- */
-typedef struct OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nIndex;
-    OMX_U8  cName[OMX_MAX_STRINGNAME_SIZE];
-    OMX_DIRTYPE eDir;
-    OMX_U32 nParamCount;
-    OMX_U32 nParamSizeUsed;
-    OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE param[1];
-} OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* OMX_IndexExt_h */
-/* File EOF */
diff --git a/include/media/openmax/OMX_Other.h b/include/media/openmax/OMX_Other.h
deleted file mode 100644
index 6072ef62c8..0000000000
--- a/include/media/openmax/OMX_Other.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** @file OMX_Other.h - OpenMax IL version 1.1.2
- *  The structures needed by Other components to exchange
- *  parameters and configuration data with the components.
- */
-
-#ifndef OMX_Other_h
-#define OMX_Other_h
-
-#ifdef __cplusplus
-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_Core.h>
-
-
-/**
- * Enumeration of possible data types which match to multiple domains or no
- * domain at all.  For types which are vendor specific, a value above
- * OMX_OTHER_VENDORTSTART should be used.
- */
-typedef enum OMX_OTHER_FORMATTYPE {
-    OMX_OTHER_FormatTime = 0, /**< Transmission of various timestamps, elapsed time,
-                                   time deltas, etc */
-    OMX_OTHER_FormatPower,    /**< Perhaps used for enabling/disabling power
-                                   management, setting clocks? */
-    OMX_OTHER_FormatStats,    /**< Could be things such as frame rate, frames
-                                   dropped, etc */
-    OMX_OTHER_FormatBinary,   /**< Arbitrary binary data */
-    OMX_OTHER_FormatVendorReserved = 1000, /**< Starting value for vendor specific
-                                                formats */
-
-    OMX_OTHER_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_OTHER_FormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_OTHER_FormatMax = 0x7FFFFFFF
-} OMX_OTHER_FORMATTYPE;
-
-/**
- * Enumeration of seek modes.
- */
-typedef enum OMX_TIME_SEEKMODETYPE {
-    OMX_TIME_SeekModeFast = 0, /**< Prefer seeking to an approximation
-                                * of the requested seek position over
-                                * the actual seek position if it
-                                * results in a faster seek. */
-    OMX_TIME_SeekModeAccurate, /**< Prefer seeking to the actual seek
-                                * position over an approximation
-                                * of the requested seek position even
-                                * if it results in a slower seek. */
-    OMX_TIME_SeekModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_TIME_SeekModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_TIME_SeekModeMax = 0x7FFFFFFF
-} OMX_TIME_SEEKMODETYPE;
-
-/* Structure representing the seekmode of the component */
-typedef struct OMX_TIME_CONFIG_SEEKMODETYPE {
-    OMX_U32 nSize;                  /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;       /**< OMX specification version information */
-    OMX_TIME_SEEKMODETYPE eType;    /**< The seek mode */
-} 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
- *     time
- * OMX_IndexConfigTimeCurrentMediaTime: query of the CC's current media
- *     time
- * OMX_IndexConfigTimeCurrentAudioReference and
- * OMX_IndexConfigTimeCurrentVideoReference: audio/video reference
- *     clock sending SC its reference time
- * OMX_IndexConfigTimeClientStartTime: a Clock Component client sends
- *     this structure to the Clock Component via a SetConfig on its
- *     client port when it receives a buffer with
- *     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:
- *
- * OMX_IndexConfigTimePosition: IL client querying component position
- * (GetConfig) or commanding a component to seek to the given location
- * (SetConfig)
- */
-typedef struct OMX_TIME_CONFIG_TIMESTAMPTYPE {
-    OMX_U32 nSize;               /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;    /**< OMX specification version
-                                  *   information */
-    OMX_U32 nPortIndex;          /**< port that this structure applies to */
-    OMX_TICKS nTimestamp;        /**< timestamp .*/
-} OMX_TIME_CONFIG_TIMESTAMPTYPE;
-
-/** Enumeration of possible reference clocks to the media time. */
-typedef enum OMX_TIME_UPDATETYPE {
-      OMX_TIME_UpdateRequestFulfillment,    /**< Update is the fulfillment of a media time request. */
-      OMX_TIME_UpdateScaleChanged,          /**< Update was generated because the scale chagned. */
-      OMX_TIME_UpdateClockStateChanged,     /**< Update was generated because the clock state changed. */
-      OMX_TIME_UpdateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-      OMX_TIME_UpdateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-      OMX_TIME_UpdateMax = 0x7FFFFFFF
-} OMX_TIME_UPDATETYPE;
-
-/** Enumeration of possible reference clocks to the media time. */
-typedef enum OMX_TIME_REFCLOCKTYPE {
-      OMX_TIME_RefClockNone,    /**< Use no references. */
-      OMX_TIME_RefClockAudio,   /**< Use references sent through OMX_IndexConfigTimeCurrentAudioReference */
-      OMX_TIME_RefClockVideo,   /**< Use references sent through OMX_IndexConfigTimeCurrentVideoReference */
-      OMX_TIME_RefClockKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-      OMX_TIME_RefClockVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-      OMX_TIME_RefClockMax = 0x7FFFFFFF
-} OMX_TIME_REFCLOCKTYPE;
-
-/** Enumeration of clock states. */
-typedef enum OMX_TIME_CLOCKSTATE {
-      OMX_TIME_ClockStateRunning,             /**< Clock running. */
-      OMX_TIME_ClockStateWaitingForStartTime, /**< Clock waiting until the
-                                               *   prescribed clients emit their
-                                               *   start time. */
-      OMX_TIME_ClockStateStopped,             /**< Clock stopped. */
-      OMX_TIME_ClockStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-      OMX_TIME_ClockStateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-      OMX_TIME_ClockStateMax = 0x7FFFFFFF
-} OMX_TIME_CLOCKSTATE;
-
-/** Structure representing a media time request to the clock component.
- *
- *  A client component sends this structure to the Clock Component via a SetConfig
- *  on its client port to specify a media timestamp the Clock Component
- *  should emit.  The Clock Component should fulfill the request by sending a
- *  OMX_TIME_MEDIATIMETYPE when its media clock matches the requested
- *  timestamp.
- *
- *  The client may require a media time request be fulfilled slightly
- *  earlier than the media time specified. In this case the client specifies
- *  an offset which is equal to the difference between wall time corresponding
- *  to the requested media time and the wall time when it will be
- *  fulfilled.
- *
- *  A client component may uses these requests and the OMX_TIME_MEDIATIMETYPE to
- *  time events according to timestamps. If a client must perform an operation O at
- *  a time T (e.g. deliver a video frame at its corresponding timestamp), it makes a
- *  media time request at T (perhaps specifying an offset to ensure the request fulfillment
- *  is a little early). When the clock component passes the resulting OMX_TIME_MEDIATIMETYPE
- *  structure back to the client component, the client may perform operation O (perhaps having
- *  to wait a slight amount more time itself as specified by the return values).
- */
-
-typedef struct OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version information */
-    OMX_U32 nPortIndex;         /**< port that this structure applies to */
-    OMX_PTR pClientPrivate;     /**< Client private data to disabiguate this media time
-                                 *   from others (e.g. the number of the frame to deliver).
-                                 *   Duplicated in the media time structure that fulfills
-                                 *   this request. A value of zero is reserved for time scale
-                                 *   updates. */
-    OMX_TICKS nMediaTimestamp;  /**< Media timestamp requested.*/
-    OMX_TICKS nOffset;          /**< Amount of wall clock time by which this
-                                 *   request should be fulfilled early */
-} OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE;
-
-/**< Structure sent from the clock component client either when fulfilling
- *   a media time request or when the time scale has changed.
- *
- *   In the former case the Clock Component fills this structure and times its emission
- *   to a client component (via the client port) according to the corresponding media
- *   time request sent by the client. The Clock Component should time the emission to occur
- *   when the requested timestamp matches the Clock Component's media time but also the
- *   prescribed offset early.
- *
- *   Upon scale changes the clock component clears the nClientPrivate data, sends the current
- *   media time and sets the nScale to the new scale via the client port. It emits a
- *   OMX_TIME_MEDIATIMETYPE to all clients independent of any requests. This allows clients to
- *   alter processing to accomodate scaling. For instance a video component might skip inter-frames
- *   in the case of extreme fastforward. Likewise an audio component might add or remove samples
- *   from an audio frame to scale audio data.
- *
- *   It is expected that some clock components may not be able to fulfill requests
- *   at exactly the prescribed time. This is acceptable so long as the request is
- *   fulfilled at least as early as described and not later. This structure provides
- *   fields the client may use to wait for the remaining time.
- *
- *   The client may use either the nOffset or nWallTimeAtMedia fields to determine the
- *   wall time until the nMediaTimestamp actually occurs. In the latter case the
- *   client can get a more accurate value for offset by getting the current wall
- *   from the cloc component and subtracting it from nWallTimeAtMedia.
- */
-
-typedef struct OMX_TIME_MEDIATIMETYPE {
-    OMX_U32 nSize;                  /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;       /**< OMX specification version information */
-    OMX_U32 nClientPrivate;         /**< Client private data to disabiguate this media time
-                                     *   from others. Copied from the media time request.
-                                     *   A value of zero is reserved for time scale updates. */
-    OMX_TIME_UPDATETYPE eUpdateType; /**< Reason for the update */
-    OMX_TICKS nMediaTimestamp;      /**< Media time requested. If no media time was
-                                     *   requested then this is the current media time. */
-    OMX_TICKS nOffset;              /**< Amount of wall clock time by which this
-                                     *   request was actually fulfilled early */
-
-    OMX_TICKS nWallTimeAtMediaTime; /**< Wall time corresponding to nMediaTimeStamp.
-                                     *   A client may compare this value to current
-                                     *   media time obtained from the Clock Component to determine
-                                     *   the wall time until the media timestamp is really
-                                     *   current. */
-    OMX_S32 xScale;                 /**< Current media time scale in Q16 format. */
-    OMX_TIME_CLOCKSTATE eState;     /* Seeking Change. Added 7/12.*/
-                                    /**< State of the media time. */
-} OMX_TIME_MEDIATIMETYPE;
-
-/** Structure representing the current media time scale factor. Applicable only to clock
- *  component, other components see scale changes via OMX_TIME_MEDIATIMETYPE buffers sent via
- *  the clock component client ports. Upon recieving this config the clock component changes
- *  the rate by which the media time increases or decreases effectively implementing trick modes.
- */
-typedef struct OMX_TIME_CONFIG_SCALETYPE {
-    OMX_U32 nSize;                  /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;       /**< OMX specification version information */
-    OMX_S32 xScale;                 /**< This is a value in Q16 format which is used for
-                                     * scaling the media time */
-} OMX_TIME_CONFIG_SCALETYPE;
-
-/** 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
-#define OMX_CLOCKPORT3 0x00000008
-#define OMX_CLOCKPORT4 0x00000010
-#define OMX_CLOCKPORT5 0x00000020
-#define OMX_CLOCKPORT6 0x00000040
-#define OMX_CLOCKPORT7 0x00000080
-
-/** Structure representing the current mode of the media clock.
- *  IL Client uses this config to change or query the mode of the
- *  media clock of the clock component. Applicable only to clock
- *  component.
- *
- *  On a SetConfig if eState is OMX_TIME_ClockStateRunning media time
- *  starts immediately at the prescribed start time. If
- *  OMX_TIME_ClockStateWaitingForStartTime the Clock Component ignores
- *  the given nStartTime and waits for all clients specified in the
- *  nWaitMask to send starttimes (via
- *  OMX_IndexConfigTimeClientStartTime). The Clock Component then starts
- *  the media clock using the earliest start time supplied. */
-typedef struct OMX_TIME_CONFIG_CLOCKSTATETYPE {
-    OMX_U32 nSize;              /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;   /**< OMX specification version
-                                 *   information */
-    OMX_TIME_CLOCKSTATE eState; /**< State of the media time. */
-    OMX_TICKS nStartTime;       /**< Start time of the media time. */
-    OMX_TICKS nOffset;          /**< Time to offset the media time by
-                                 * (e.g. preroll). Media time will be
-                                 * reported to be nOffset ticks earlier.
-                                 */
-    OMX_U32 nWaitMask;          /**< Mask of OMX_CLOCKPORT values. */
-} OMX_TIME_CONFIG_CLOCKSTATETYPE;
-
-/** Structure representing the reference clock currently being used to
- *  compute media time. IL client uses this config to change or query the
- *  clock component's active reference clock */
-typedef struct OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE {
-    OMX_U32 nSize;                  /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion;       /**< OMX specification version information */
-    OMX_TIME_REFCLOCKTYPE eClock;   /**< Reference clock used to compute media time */
-} OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE;
-
-/** Descriptor for setting specifics of power type.
- *  Note: this structure is listed for backwards compatibility. */
-typedef struct OMX_OTHER_CONFIG_POWERTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_BOOL bEnablePM;       /**< Flag to enable Power Management */
-} OMX_OTHER_CONFIG_POWERTYPE;
-
-
-/** Descriptor for setting specifics of stats type.
- *  Note: this structure is listed for backwards compatibility. */
-typedef struct OMX_OTHER_CONFIG_STATSTYPE {
-    OMX_U32 nSize;            /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    /* what goes here */
-} OMX_OTHER_CONFIG_STATSTYPE;
-
-
-/**
- * The PortDefinition structure is used to define all of the parameters
- * necessary for the compliant component to setup an input or an output other
- * path.
- */
-typedef struct OMX_OTHER_PORTDEFINITIONTYPE {
-    OMX_OTHER_FORMATTYPE eFormat;  /**< Type of data expected for this channel */
-} OMX_OTHER_PORTDEFINITIONTYPE;
-
-/**  Port format parameter.  This structure is used to enumerate
-  *  the various data input/output format supported by the port.
-  */
-typedef struct OMX_OTHER_PARAM_PORTFORMATTYPE {
-    OMX_U32 nSize; /**< size of the structure in bytes */
-    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
-    OMX_U32 nPortIndex; /**< Indicates which port to set */
-    OMX_U32 nIndex; /**< Indicates the enumeration index for the format from 0x0 to N-1 */
-    OMX_OTHER_FORMATTYPE eFormat; /**< Type of data expected for this channel */
-} OMX_OTHER_PARAM_PORTFORMATTYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
diff --git a/include/media/openmax/OMX_Types.h b/include/media/openmax/OMX_Types.h
deleted file mode 100644
index 515e002213..0000000000
--- a/include/media/openmax/OMX_Types.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** OMX_Types.h - OpenMax IL version 1.1.2
- *  The OMX_Types header file contains the primitive type definitions used by
- *  the core, the application and the component.  This file may need to be
- *  modified to be used on systems that do not have "char" set to 8 bits,
- *  "short" set to 16 bits and "long" set to 32 bits.
- */
-
-#ifndef OMX_Types_h
-#define OMX_Types_h
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/** The OMX_API and OMX_APIENTRY are platform specific definitions used
- *  to declare OMX function prototypes.  They are modified to meet the
- *  requirements for a particular platform */
-#ifdef __SYMBIAN32__
-#   ifdef __OMX_EXPORTS
-#       define OMX_API __declspec(dllexport)
-#   else
-#       ifdef _WIN32
-#           define OMX_API __declspec(dllexport)
-#       else
-#           define OMX_API __declspec(dllimport)
-#       endif
-#   endif
-#else
-#   ifdef _WIN32
-#      ifdef __OMX_EXPORTS
-#          define OMX_API __declspec(dllexport)
-#      else
-//#          define OMX_API __declspec(dllimport)
-#define OMX_API
-#      endif
-#   else
-#      ifdef __OMX_EXPORTS
-#          define OMX_API
-#      else
-#          define OMX_API extern
-#      endif
-#   endif
-#endif
-
-#ifndef OMX_APIENTRY
-#define OMX_APIENTRY
-#endif
-
-/** OMX_IN is used to identify inputs to an OMX function.  This designation
-    will also be used in the case of a pointer that points to a parameter
-    that is used as an output. */
-#ifndef OMX_IN
-#define OMX_IN
-#endif
-
-/** OMX_OUT is used to identify outputs from an OMX function.  This
-    designation will also be used in the case of a pointer that points
-    to a parameter that is used as an input. */
-#ifndef OMX_OUT
-#define OMX_OUT
-#endif
-
-
-/** OMX_INOUT is used to identify parameters that may be either inputs or
-    outputs from an OMX function at the same time.  This designation will
-    also be used in the case of a pointer that  points to a parameter that
-    is used both as an input and an output. */
-#ifndef OMX_INOUT
-#define OMX_INOUT
-#endif
-
-/** OMX_ALL is used to as a wildcard to select all entities of the same type
- *  when specifying the index, or referring to a object by an index.  (i.e.
- *  use OMX_ALL to indicate all N channels). When used as a port index
- *  for a config or parameter this OMX_ALL denotes that the config or
- *  parameter applies to the entire component not just one port. */
-#define OMX_ALL 0xFFFFFFFF
-
-/** In the following we define groups that help building doxygen documentation */
-
-/** @defgroup core OpenMAX IL core
- * Functions and structure related to the OMX IL core
- */
-
- /** @defgroup comp OpenMAX IL component
- * Functions and structure related to the OMX IL component
- */
-
-/** @defgroup rpm Resource and Policy Management
- * Structures for resource and policy management of components
- */
-
-/** @defgroup buf Buffer Management
- * Buffer handling functions and structures
- */
-
-/** @defgroup tun Tunneling
- * @ingroup core comp
- * Structures and functions to manage tunnels among component ports
- */
-
-/** @defgroup cp Content Pipes
- *  @ingroup core
- */
-
- /** @defgroup metadata Metadata handling
-  *
-  */
-
-/** OMX_U8 is an 8 bit unsigned quantity that is byte aligned */
-typedef unsigned char OMX_U8;
-
-/** OMX_S8 is an 8 bit signed quantity that is byte aligned */
-typedef signed char OMX_S8;
-
-/** OMX_U16 is a 16 bit unsigned quantity that is 16 bit word aligned */
-typedef unsigned short OMX_U16;
-
-/** OMX_S16 is a 16 bit signed quantity that is 16 bit word aligned */
-typedef signed short OMX_S16;
-
-/** OMX_U32 is a 32 bit unsigned quantity that is 32 bit word aligned */
-typedef uint32_t OMX_U32;
-
-/** OMX_S32 is a 32 bit signed quantity that is 32 bit word aligned */
-typedef int32_t OMX_S32;
-
-
-/* Users with compilers that cannot accept the "long long" designation should
-   define the OMX_SKIP64BIT macro.  It should be noted that this may cause
-   some components to fail to compile if the component was written to require
-   64 bit integral types.  However, these components would NOT compile anyway
-   since the compiler does not support the way the component was written.
-*/
-#ifndef OMX_SKIP64BIT
-#ifdef __SYMBIAN32__
-/** OMX_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */
-typedef unsigned long long OMX_U64;
-
-/** OMX_S64 is a 64 bit signed quantity that is 64 bit word aligned */
-typedef signed long long OMX_S64;
-
-#elif defined(WIN32)
-
-/** OMX_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */
-typedef unsigned __int64  OMX_U64;
-
-/** OMX_S64 is a 64 bit signed quantity that is 64 bit word aligned */
-typedef signed   __int64  OMX_S64;
-
-#else /* WIN32 */
-
-/** OMX_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */
-typedef unsigned long long OMX_U64;
-
-/** OMX_S64 is a 64 bit signed quantity that is 64 bit word aligned */
-typedef signed long long OMX_S64;
-
-#endif /* WIN32 */
-#endif
-
-
-/** The OMX_BOOL type is intended to be used to represent a true or a false
-    value when passing parameters to and from the OMX core and components.  The
-    OMX_BOOL is a 32 bit quantity and is aligned on a 32 bit word boundary.
- */
-typedef enum OMX_BOOL {
-    OMX_FALSE = 0,
-    OMX_TRUE = !OMX_FALSE,
-    OMX_BOOL_MAX = 0x7FFFFFFF
-} OMX_BOOL;
-
-/*
- * Temporary Android 64 bit modification
- *
- * #define OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
- * overrides all OMX pointer types to be uint32_t.
- *
- * After this change, OMX codecs will work in 32 bit only, so 64 bit processes
- * must communicate to a remote 32 bit process for OMX to work.
- */
-
-#ifdef OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
-
-typedef uint32_t OMX_PTR;
-typedef OMX_PTR OMX_STRING;
-typedef OMX_PTR OMX_BYTE;
-
-#else /* OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS */
-
-/** The OMX_PTR type is intended to be used to pass pointers between the OMX
-    applications and the OMX Core and components.  This is a 32 bit pointer and
-    is aligned on a 32 bit boundary.
- */
-typedef void* OMX_PTR;
-
-/** The OMX_STRING type is intended to be used to pass "C" type strings between
-    the application and the core and component.  The OMX_STRING type is a 32
-    bit pointer to a zero terminated string.  The  pointer is word aligned and
-    the string is byte aligned.
- */
-typedef char* OMX_STRING;
-
-/** The OMX_BYTE type is intended to be used to pass arrays of bytes such as
-    buffers between the application and the component and core.  The OMX_BYTE
-    type is a 32 bit pointer to a zero terminated string.  The  pointer is word
-    aligned and the string is byte aligned.
- */
-typedef unsigned char* OMX_BYTE;
-
-#endif /* OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS */
-
-/** OMX_UUIDTYPE is a very long unique identifier to uniquely identify
-    at runtime.  This identifier should be generated by a component in a way
-    that guarantees that every instance of the identifier running on the system
-    is unique. */
-typedef unsigned char OMX_UUIDTYPE[128];
-
-/** The OMX_DIRTYPE enumeration is used to indicate if a port is an input or
-    an output port.  This enumeration is common across all component types.
- */
-typedef enum OMX_DIRTYPE
-{
-    OMX_DirInput,              /**< Port is an input port */
-    OMX_DirOutput,             /**< Port is an output port */
-    OMX_DirMax = 0x7FFFFFFF
-} OMX_DIRTYPE;
-
-/** The OMX_ENDIANTYPE enumeration is used to indicate the bit ordering
-    for numerical data (i.e. big endian, or little endian).
- */
-typedef enum OMX_ENDIANTYPE
-{
-    OMX_EndianBig, /**< big endian */
-    OMX_EndianLittle, /**< little endian */
-    OMX_EndianMax = 0x7FFFFFFF
-} OMX_ENDIANTYPE;
-
-
-/** The OMX_NUMERICALDATATYPE enumeration is used to indicate if data
-    is signed, unsigned or floating point (Android extension).
-
-    Android floating point support policy:
-    If component does not support floating point raw audio, it can reset
-    configuration to signed 16-bit integer (support for which is required.)
-    nBitsPerSample will be set to 32 for float data.
- */
-typedef enum OMX_NUMERICALDATATYPE
-{
-    OMX_NumericalDataSigned, /**< signed data */
-    OMX_NumericalDataUnsigned, /**< unsigned data */
-    OMX_NumericalDataFloat = 0x7F000001, /**< floating point data */
-    OMX_NumercialDataMax = 0x7FFFFFFF
-} OMX_NUMERICALDATATYPE;
-
-
-/** Unsigned bounded value type */
-typedef struct OMX_BU32 {
-    OMX_U32 nValue; /**< actual value */
-    OMX_U32 nMin;   /**< minimum for value (i.e. nValue >= nMin) */
-    OMX_U32 nMax;   /**< maximum for value (i.e. nValue <= nMax) */
-} OMX_BU32;
-
-
-/** Signed bounded value type */
-typedef struct OMX_BS32 {
-    OMX_S32 nValue; /**< actual value */
-    OMX_S32 nMin;   /**< minimum for value (i.e. nValue >= nMin) */
-    OMX_S32 nMax;   /**< maximum for value (i.e. nValue <= nMax) */
-} OMX_BS32;
-
-
-/** Structure representing some time or duration in microseconds. This structure
-  *  must be interpreted as a signed 64 bit value. The quantity is signed to accommodate
-  *  negative deltas and preroll scenarios. The quantity is represented in microseconds
-  *  to accomodate high resolution timestamps (e.g. DVD presentation timestamps based
-  *  on a 90kHz clock) and to allow more accurate and synchronized delivery (e.g.
-  *  individual audio samples delivered at 192 kHz). The quantity is 64 bit to
-  *  accommodate a large dynamic range (signed 32 bit values would allow only for plus
-  *  or minus 35 minutes).
-  *
-  *  Implementations with limited precision may convert the signed 64 bit value to
-  *  a signed 32 bit value internally but risk loss of precision.
-  */
-#ifndef OMX_SKIP64BIT
-typedef OMX_S64 OMX_TICKS;
-#else
-typedef struct OMX_TICKS
-{
-    OMX_U32 nLowPart;    /** low bits of the signed 64 bit tick value */
-    OMX_U32 nHighPart;   /** high bits of the signed 64 bit tick value */
-} OMX_TICKS;
-#endif
-#define OMX_TICKS_PER_SECOND 1000000
-
-/** Define the public interface for the OMX Handle.  The core will not use
-    this value internally, but the application should only use this value.
- */
-typedef OMX_PTR OMX_HANDLETYPE;
-
-typedef struct OMX_MARKTYPE
-{
-    OMX_HANDLETYPE hMarkTargetComponent;   /**< The component that will
-                                                generate a mark event upon
-                                                processing the mark. */
-    OMX_PTR pMarkData;   /**< Application specific data associated with
-                              the mark sent on a mark event to disambiguate
-                              this mark from others. */
-} OMX_MARKTYPE;
-
-
-/** OMX_NATIVE_DEVICETYPE is used to map a OMX video port to the
- *  platform & operating specific object used to reference the display
- *  or can be used by a audio port for native audio rendering */
-typedef OMX_PTR OMX_NATIVE_DEVICETYPE;
-
-/** OMX_NATIVE_WINDOWTYPE is used to map a OMX video port to the
- *  platform & operating specific object used to reference the window */
-typedef OMX_PTR OMX_NATIVE_WINDOWTYPE;
-
-/** The OMX_VERSIONTYPE union is used to specify the version for
-    a structure or component.  For a component, the version is entirely
-    specified by the component vendor.  Components doing the same function
-    from different vendors may or may not have the same version.  For
-    structures, the version shall be set by the entity that allocates the
-    structure.  For structures specified in the OMX 1.1 specification, the
-    value of the version shall be set to 1.1.0.0 in all cases.  Access to the
-    OMX_VERSIONTYPE can be by a single 32 bit access (e.g. by nVersion) or
-    by accessing one of the structure elements to, for example, check only
-    the Major revision.
- */
-typedef union OMX_VERSIONTYPE
-{
-    struct
-    {
-        OMX_U8 nVersionMajor;   /**< Major version accessor element */
-        OMX_U8 nVersionMinor;   /**< Minor version accessor element */
-        OMX_U8 nRevision;       /**< Revision version accessor element */
-        OMX_U8 nStep;           /**< Step version accessor element */
-    } s;
-    OMX_U32 nVersion;           /**< 32 bit value to make accessing the
-                                    version easily done in a single word
-                                    size copy/compare operation */
-} OMX_VERSIONTYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
diff --git a/include/media/openmax/OMX_Video.h b/include/media/openmax/OMX_Video.h
deleted file mode 100644
index 76efac9b3e..0000000000
--- a/include/media/openmax/OMX_Video.h
+++ /dev/null
@@ -1,1086 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/**
- * Copyright (c) 2008 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/**
- *  @file OMX_Video.h - OpenMax IL version 1.1.2
- *  The structures is needed by Video components to exchange parameters
- *  and configuration data with OMX components.
- */
-#ifndef OMX_Video_h
-#define OMX_Video_h
-
-/** @defgroup video OpenMAX IL Video Domain
- * @ingroup iv
- * Structures for OpenMAX IL Video domain
- * @{
- */
-
-#ifdef __cplusplus
-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_IVCommon.h>
-
-
-/**
- * Enumeration used to define the possible video compression codings.
- * NOTE:  This essentially refers to file extensions. If the coding is
- *        being used to specify the ENCODE type, then additional work
- *        must be done to configure the exact flavor of the compression
- *        to be used.  For decode cases where the user application can
- *        not differentiate between MPEG-4 and H.264 bit streams, it is
- *        up to the codec to handle this.
- */
-typedef enum OMX_VIDEO_CODINGTYPE {
-    OMX_VIDEO_CodingUnused,     /**< Value when coding is N/A */
-    OMX_VIDEO_CodingAutoDetect, /**< Autodetection of coding type */
-    OMX_VIDEO_CodingMPEG2,      /**< AKA: H.262 */
-    OMX_VIDEO_CodingH263,       /**< H.263 */
-    OMX_VIDEO_CodingMPEG4,      /**< MPEG-4 */
-    OMX_VIDEO_CodingWMV,        /**< all versions of Windows Media Video */
-    OMX_VIDEO_CodingRV,         /**< all versions of Real Video */
-    OMX_VIDEO_CodingAVC,        /**< H.264/AVC */
-    OMX_VIDEO_CodingMJPEG,      /**< Motion JPEG */
-    OMX_VIDEO_CodingVP8,        /**< Google VP8, formerly known as On2 VP8 */
-    OMX_VIDEO_CodingVP9,        /**< Google VP9 */
-    OMX_VIDEO_CodingHEVC,       /**< ITU H.265/HEVC */
-    OMX_VIDEO_CodingDolbyVision,/**< Dolby Vision */
-    OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_CodingMax = 0x7FFFFFFF
-} OMX_VIDEO_CODINGTYPE;
-
-
-/**
- * Data structure used to define a video path.  The number of Video paths for
- * input and output will vary by type of the Video component.
- *
- *    Input (aka Source) : zero Inputs, one Output,
- *    Splitter           : one Input, 2 or more Outputs,
- *    Processing Element : one Input, one output,
- *    Mixer              : 2 or more inputs, one output,
- *    Output (aka Sink)  : one Input, zero outputs.
- *
- * The PortDefinition structure is used to define all of the parameters
- * necessary for the compliant component to setup an input or an output video
- * path.  If additional vendor specific data is required, it should be
- * transmitted to the component using the CustomCommand function.  Compliant
- * components will prepopulate this structure with optimal values during the
- * GetDefaultInitParams command.
- *
- * STRUCT MEMBERS:
- *  cMIMEType             : MIME type of data for the port
- *  pNativeRender         : Platform specific reference for a display if a
- *                          sync, otherwise this field is 0
- *  nFrameWidth           : Width of frame to be used on channel if
- *                          uncompressed format is used.  Use 0 for unknown,
- *                          don't care or variable
- *  nFrameHeight          : Height of frame to be used on channel if
- *                          uncompressed format is used. Use 0 for unknown,
- *                          don't care or variable
- *  nStride               : Number of bytes per span of an image
- *                          (i.e. indicates the number of bytes to get
- *                          from span N to span N+1, where negative stride
- *                          indicates the image is bottom up
- *  nSliceHeight          : Height used when encoding in slices
- *  nBitrate              : Bit rate of frame to be used on channel if
- *                          compressed format is used. Use 0 for unknown,
- *                          don't care or variable
- *  xFramerate            : Frame rate to be used on channel if uncompressed
- *                          format is used. Use 0 for unknown, don't care or
- *                          variable.  Units are Q16 frames per second.
- *  bFlagErrorConcealment : Turns on error concealment if it is supported by
- *                          the OMX component
- *  eCompressionFormat    : Compression format used in this instance of the
- *                          component. When OMX_VIDEO_CodingUnused is
- *                          specified, eColorFormat is used
- *  eColorFormat : Decompressed format used by this component
- *  pNativeWindow : Platform specific reference for a window object if a
- *                          display sink , otherwise this field is 0x0.
- */
-typedef struct OMX_VIDEO_PORTDEFINITIONTYPE {
-    OMX_STRING cMIMEType;
-    OMX_NATIVE_DEVICETYPE pNativeRender;
-    OMX_U32 nFrameWidth;
-    OMX_U32 nFrameHeight;
-    OMX_S32 nStride;
-    OMX_U32 nSliceHeight;
-    OMX_U32 nBitrate;
-    OMX_U32 xFramerate;
-    OMX_BOOL bFlagErrorConcealment;
-    OMX_VIDEO_CODINGTYPE eCompressionFormat;
-    OMX_COLOR_FORMATTYPE eColorFormat;
-    OMX_NATIVE_WINDOWTYPE pNativeWindow;
-} OMX_VIDEO_PORTDEFINITIONTYPE;
-
-/**
- * Port format parameter.  This structure is used to enumerate the various
- * data input/output format supported by the port.
- *
- * STRUCT MEMBERS:
- *  nSize              : Size of the structure in bytes
- *  nVersion           : OMX specification version information
- *  nPortIndex         : Indicates which port to set
- *  nIndex             : Indicates the enumeration index for the format from
- *                       0x0 to N-1
- *  eCompressionFormat : Compression format used in this instance of the
- *                       component. When OMX_VIDEO_CodingUnused is specified,
- *                       eColorFormat is used
- *  eColorFormat       : Decompressed format used by this component
- *  xFrameRate         : Indicates the video frame rate in Q16 format
- */
-typedef struct OMX_VIDEO_PARAM_PORTFORMATTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nIndex;
-    OMX_VIDEO_CODINGTYPE eCompressionFormat;
-    OMX_COLOR_FORMATTYPE eColorFormat;
-    OMX_U32 xFramerate;
-} OMX_VIDEO_PARAM_PORTFORMATTYPE;
-
-
-/**
- * This is a structure for configuring video compression quantization
- * parameter values.  Codecs may support different QP values for different
- * frame types.
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version info
- *  nPortIndex : Port that this structure applies to
- *  nQpI       : QP value to use for index frames
- *  nQpP       : QP value to use for P frames
- *  nQpB       : QP values to use for bidirectional frames
- */
-typedef struct OMX_VIDEO_PARAM_QUANTIZATIONTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nQpI;
-    OMX_U32 nQpP;
-    OMX_U32 nQpB;
-} OMX_VIDEO_PARAM_QUANTIZATIONTYPE;
-
-
-/**
- * Structure for configuration of video fast update parameters.
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version info
- *  nPortIndex : Port that this structure applies to
- *  bEnableVFU : Enable/Disable video fast update
- *  nFirstGOB  : Specifies the number of the first macroblock row
- *  nFirstMB   : specifies the first MB relative to the specified first GOB
- *  nNumMBs    : Specifies the number of MBs to be refreshed from nFirstGOB
- *               and nFirstMB
- */
-typedef struct OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bEnableVFU;
-    OMX_U32 nFirstGOB;
-    OMX_U32 nFirstMB;
-    OMX_U32 nNumMBs;
-} OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE;
-
-
-/**
- * Enumeration of possible bitrate control types
- */
-typedef enum OMX_VIDEO_CONTROLRATETYPE {
-    OMX_Video_ControlRateDisable,
-    OMX_Video_ControlRateVariable,
-    OMX_Video_ControlRateConstant,
-    OMX_Video_ControlRateVariableSkipFrames,
-    OMX_Video_ControlRateConstantSkipFrames,
-    OMX_Video_ControlRateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_Video_ControlRateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_Video_ControlRateMax = 0x7FFFFFFF
-} OMX_VIDEO_CONTROLRATETYPE;
-
-
-/**
- * Structure for configuring bitrate mode of a codec.
- *
- * STRUCT MEMBERS:
- *  nSize          : Size of the struct in bytes
- *  nVersion       : OMX spec version info
- *  nPortIndex     : Port that this struct applies to
- *  eControlRate   : Control rate type enum
- *  nTargetBitrate : Target bitrate to encode with
- */
-typedef struct OMX_VIDEO_PARAM_BITRATETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_CONTROLRATETYPE eControlRate;
-    OMX_U32 nTargetBitrate;
-} OMX_VIDEO_PARAM_BITRATETYPE;
-
-
-/**
- * Enumeration of possible motion vector (MV) types
- */
-typedef enum OMX_VIDEO_MOTIONVECTORTYPE {
-    OMX_Video_MotionVectorPixel,
-    OMX_Video_MotionVectorHalfPel,
-    OMX_Video_MotionVectorQuarterPel,
-    OMX_Video_MotionVectorEighthPel,
-    OMX_Video_MotionVectorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_Video_MotionVectorVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_Video_MotionVectorMax = 0x7FFFFFFF
-} OMX_VIDEO_MOTIONVECTORTYPE;
-
-
-/**
- * Structure for configuring the number of motion vectors used as well
- * as their accuracy.
- *
- * STRUCT MEMBERS:
- *  nSize            : Size of the struct in bytes
- *  nVersion         : OMX spec version info
- *  nPortIndex       : port that this structure applies to
- *  eAccuracy        : Enumerated MV accuracy
- *  bUnrestrictedMVs : Allow unrestricted MVs
- *  bFourMV          : Allow use of 4 MVs
- *  sXSearchRange    : Search range in horizontal direction for MVs
- *  sYSearchRange    : Search range in vertical direction for MVs
- */
-typedef struct OMX_VIDEO_PARAM_MOTIONVECTORTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_MOTIONVECTORTYPE eAccuracy;
-    OMX_BOOL bUnrestrictedMVs;
-    OMX_BOOL bFourMV;
-    OMX_S32 sXSearchRange;
-    OMX_S32 sYSearchRange;
-} OMX_VIDEO_PARAM_MOTIONVECTORTYPE;
-
-
-/**
- * Enumeration of possible methods to use for Intra Refresh
- */
-typedef enum OMX_VIDEO_INTRAREFRESHTYPE {
-    OMX_VIDEO_IntraRefreshCyclic,
-    OMX_VIDEO_IntraRefreshAdaptive,
-    OMX_VIDEO_IntraRefreshBoth,
-    OMX_VIDEO_IntraRefreshKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_IntraRefreshVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_IntraRefreshMax = 0x7FFFFFFF
-} OMX_VIDEO_INTRAREFRESHTYPE;
-
-
-/**
- * Structure for configuring intra refresh mode
- *
- * STRUCT MEMBERS:
- *  nSize        : Size of the structure in bytes
- *  nVersion     : OMX specification version information
- *  nPortIndex   : Port that this structure applies to
- *  eRefreshMode : Cyclic, Adaptive, or Both
- *  nAirMBs      : Number of intra macroblocks to refresh in a frame when
- *                 AIR is enabled
- *  nAirRef      : Number of times a motion marked macroblock has to be
- *                 intra coded
- *  nCirMBs      : Number of consecutive macroblocks to be coded as "intra"
- *                 when CIR is enabled
- */
-typedef struct OMX_VIDEO_PARAM_INTRAREFRESHTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_INTRAREFRESHTYPE eRefreshMode;
-    OMX_U32 nAirMBs;
-    OMX_U32 nAirRef;
-    OMX_U32 nCirMBs;
-} OMX_VIDEO_PARAM_INTRAREFRESHTYPE;
-
-
-/**
- * Structure for enabling various error correction methods for video
- * compression.
- *
- * STRUCT MEMBERS:
- *  nSize                   : Size of the structure in bytes
- *  nVersion                : OMX specification version information
- *  nPortIndex              : Port that this structure applies to
- *  bEnableHEC              : Enable/disable header extension codes (HEC)
- *  bEnableResync           : Enable/disable resynchronization markers
- *  nResynchMarkerSpacing   : Resynch markers interval (in bits) to be
- *                            applied in the stream
- *  bEnableDataPartitioning : Enable/disable data partitioning
- *  bEnableRVLC             : Enable/disable reversible variable length
- *                            coding
- */
-typedef struct OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bEnableHEC;
-    OMX_BOOL bEnableResync;
-    OMX_U32  nResynchMarkerSpacing;
-    OMX_BOOL bEnableDataPartitioning;
-    OMX_BOOL bEnableRVLC;
-} OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE;
-
-
-/**
- * Configuration of variable block-size motion compensation (VBSMC)
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  b16x16     : Enable inter block search 16x16
- *  b16x8      : Enable inter block search 16x8
- *  b8x16      : Enable inter block search 8x16
- *  b8x8       : Enable inter block search 8x8
- *  b8x4       : Enable inter block search 8x4
- *  b4x8       : Enable inter block search 4x8
- *  b4x4       : Enable inter block search 4x4
- */
-typedef struct OMX_VIDEO_PARAM_VBSMCTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL b16x16;
-    OMX_BOOL b16x8;
-    OMX_BOOL b8x16;
-    OMX_BOOL b8x8;
-    OMX_BOOL b8x4;
-    OMX_BOOL b4x8;
-    OMX_BOOL b4x4;
-} OMX_VIDEO_PARAM_VBSMCTYPE;
-
-
-/**
- * H.263 profile types, each profile indicates support for various
- * performance bounds and different annexes.
- *
- * ENUMS:
- *  Baseline           : Baseline Profile: H.263 (V1), no optional modes
- *  H320 Coding        : H.320 Coding Efficiency Backward Compatibility
- *                       Profile: H.263+ (V2), includes annexes I, J, L.4
- *                       and T
- *  BackwardCompatible : Backward Compatibility Profile: H.263 (V1),
- *                       includes annex F
- *  ISWV2              : Interactive Streaming Wireless Profile: H.263+
- *                       (V2), includes annexes I, J, K and T
- *  ISWV3              : Interactive Streaming Wireless Profile: H.263++
- *                       (V3), includes profile 3 and annexes V and W.6.3.8
- *  HighCompression    : Conversational High Compression Profile: H.263++
- *                       (V3), includes profiles 1 & 2 and annexes D and U
- *  Internet           : Conversational Internet Profile: H.263++ (V3),
- *                       includes profile 5 and annex K
- *  Interlace          : Conversational Interlace Profile: H.263++ (V3),
- *                       includes profile 5 and annex W.6.3.11
- *  HighLatency        : High Latency Profile: H.263++ (V3), includes
- *                       profile 6 and annexes O.1 and P.5
- */
-typedef enum OMX_VIDEO_H263PROFILETYPE {
-    OMX_VIDEO_H263ProfileBaseline            = 0x01,
-    OMX_VIDEO_H263ProfileH320Coding          = 0x02,
-    OMX_VIDEO_H263ProfileBackwardCompatible  = 0x04,
-    OMX_VIDEO_H263ProfileISWV2               = 0x08,
-    OMX_VIDEO_H263ProfileISWV3               = 0x10,
-    OMX_VIDEO_H263ProfileHighCompression     = 0x20,
-    OMX_VIDEO_H263ProfileInternet            = 0x40,
-    OMX_VIDEO_H263ProfileInterlace           = 0x80,
-    OMX_VIDEO_H263ProfileHighLatency         = 0x100,
-    OMX_VIDEO_H263ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_H263ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_H263ProfileMax                 = 0x7FFFFFFF
-} OMX_VIDEO_H263PROFILETYPE;
-
-
-/**
- * H.263 level types, each level indicates support for various frame sizes,
- * bit rates, decoder frame rates.
- */
-typedef enum OMX_VIDEO_H263LEVELTYPE {
-    OMX_VIDEO_H263Level10  = 0x01,
-    OMX_VIDEO_H263Level20  = 0x02,
-    OMX_VIDEO_H263Level30  = 0x04,
-    OMX_VIDEO_H263Level40  = 0x08,
-    OMX_VIDEO_H263Level45  = 0x10,
-    OMX_VIDEO_H263Level50  = 0x20,
-    OMX_VIDEO_H263Level60  = 0x40,
-    OMX_VIDEO_H263Level70  = 0x80,
-    OMX_VIDEO_H263LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_H263LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_H263LevelMax = 0x7FFFFFFF
-} OMX_VIDEO_H263LEVELTYPE;
-
-
-/**
- * Specifies the picture type. These values should be OR'd to signal all
- * pictures types which are allowed.
- *
- * ENUMS:
- *  Generic Picture Types:          I, P and B
- *  H.263 Specific Picture Types:   SI and SP
- *  H.264 Specific Picture Types:   EI and EP
- *  MPEG-4 Specific Picture Types:  S
- */
-typedef enum OMX_VIDEO_PICTURETYPE {
-    OMX_VIDEO_PictureTypeI   = 0x01,
-    OMX_VIDEO_PictureTypeP   = 0x02,
-    OMX_VIDEO_PictureTypeB   = 0x04,
-    OMX_VIDEO_PictureTypeSI  = 0x08,
-    OMX_VIDEO_PictureTypeSP  = 0x10,
-    OMX_VIDEO_PictureTypeEI  = 0x11,
-    OMX_VIDEO_PictureTypeEP  = 0x12,
-    OMX_VIDEO_PictureTypeS   = 0x14,
-    OMX_VIDEO_PictureTypeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_PictureTypeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_PictureTypeMax = 0x7FFFFFFF
-} OMX_VIDEO_PICTURETYPE;
-
-
-/**
- * H.263 Params
- *
- * STRUCT MEMBERS:
- *  nSize                    : Size of the structure in bytes
- *  nVersion                 : OMX specification version information
- *  nPortIndex               : Port that this structure applies to
- *  nPFrames                 : Number of P frames between each I frame
- *  nBFrames                 : Number of B frames between each I frame
- *  eProfile                 : H.263 profile(s) to use
- *  eLevel                   : H.263 level(s) to use
- *  bPLUSPTYPEAllowed        : Indicating that it is allowed to use PLUSPTYPE
- *                             (specified in the 1998 version of H.263) to
- *                             indicate custom picture sizes or clock
- *                             frequencies
- *  nAllowedPictureTypes     : Specifies the picture types allowed in the
- *                             bitstream
- *  bForceRoundingTypeToZero : value of the RTYPE bit (bit 6 of MPPTYPE) is
- *                             not constrained. It is recommended to change
- *                             the value of the RTYPE bit for each reference
- *                             picture in error-free communication
- *  nPictureHeaderRepetition : Specifies the frequency of picture header
- *                             repetition
- *  nGOBHeaderInterval       : Specifies the interval of non-empty GOB
- *                             headers in units of GOBs
- */
-typedef struct OMX_VIDEO_PARAM_H263TYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nPFrames;
-    OMX_U32 nBFrames;
-    OMX_VIDEO_H263PROFILETYPE eProfile;
-    OMX_VIDEO_H263LEVELTYPE eLevel;
-    OMX_BOOL bPLUSPTYPEAllowed;
-    OMX_U32 nAllowedPictureTypes;
-    OMX_BOOL bForceRoundingTypeToZero;
-    OMX_U32 nPictureHeaderRepetition;
-    OMX_U32 nGOBHeaderInterval;
-} OMX_VIDEO_PARAM_H263TYPE;
-
-
-/**
- * MPEG-2 profile types, each profile indicates support for various
- * performance bounds and different annexes.
- */
-typedef enum OMX_VIDEO_MPEG2PROFILETYPE {
-    OMX_VIDEO_MPEG2ProfileSimple = 0,  /**< Simple Profile */
-    OMX_VIDEO_MPEG2ProfileMain,        /**< Main Profile */
-    OMX_VIDEO_MPEG2Profile422,         /**< 4:2:2 Profile */
-    OMX_VIDEO_MPEG2ProfileSNR,         /**< SNR Profile */
-    OMX_VIDEO_MPEG2ProfileSpatial,     /**< Spatial Profile */
-    OMX_VIDEO_MPEG2ProfileHigh,        /**< High Profile */
-    OMX_VIDEO_MPEG2ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_MPEG2ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_MPEG2ProfileMax = 0x7FFFFFFF
-} OMX_VIDEO_MPEG2PROFILETYPE;
-
-
-/**
- * MPEG-2 level types, each level indicates support for various frame
- * sizes, bit rates, decoder frame rates.  No need
- */
-typedef enum OMX_VIDEO_MPEG2LEVELTYPE {
-    OMX_VIDEO_MPEG2LevelLL = 0,  /**< Low Level */
-    OMX_VIDEO_MPEG2LevelML,      /**< Main Level */
-    OMX_VIDEO_MPEG2LevelH14,     /**< High 1440 */
-    OMX_VIDEO_MPEG2LevelHL,      /**< High Level */
-    OMX_VIDEO_MPEG2LevelHP,      /**< HighP Level */
-    OMX_VIDEO_MPEG2LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_MPEG2LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_MPEG2LevelMax = 0x7FFFFFFF
-} OMX_VIDEO_MPEG2LEVELTYPE;
-
-
-/**
- * MPEG-2 params
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nPFrames   : Number of P frames between each I frame
- *  nBFrames   : Number of B frames between each I frame
- *  eProfile   : MPEG-2 profile(s) to use
- *  eLevel     : MPEG-2 levels(s) to use
- */
-typedef struct OMX_VIDEO_PARAM_MPEG2TYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nPFrames;
-    OMX_U32 nBFrames;
-    OMX_VIDEO_MPEG2PROFILETYPE eProfile;
-    OMX_VIDEO_MPEG2LEVELTYPE eLevel;
-} OMX_VIDEO_PARAM_MPEG2TYPE;
-
-
-/**
- * MPEG-4 profile types, each profile indicates support for various
- * performance bounds and different annexes.
- *
- * ENUMS:
- *  - Simple Profile, Levels 1-3
- *  - Simple Scalable Profile, Levels 1-2
- *  - Core Profile, Levels 1-2
- *  - Main Profile, Levels 2-4
- *  - N-bit Profile, Level 2
- *  - Scalable Texture Profile, Level 1
- *  - Simple Face Animation Profile, Levels 1-2
- *  - Simple Face and Body Animation (FBA) Profile, Levels 1-2
- *  - Basic Animated Texture Profile, Levels 1-2
- *  - Hybrid Profile, Levels 1-2
- *  - Advanced Real Time Simple Profiles, Levels 1-4
- *  - Core Scalable Profile, Levels 1-3
- *  - Advanced Coding Efficiency Profile, Levels 1-4
- *  - Advanced Core Profile, Levels 1-2
- *  - Advanced Scalable Texture, Levels 2-3
- */
-typedef enum OMX_VIDEO_MPEG4PROFILETYPE {
-    OMX_VIDEO_MPEG4ProfileSimple           = 0x01,
-    OMX_VIDEO_MPEG4ProfileSimpleScalable   = 0x02,
-    OMX_VIDEO_MPEG4ProfileCore             = 0x04,
-    OMX_VIDEO_MPEG4ProfileMain             = 0x08,
-    OMX_VIDEO_MPEG4ProfileNbit             = 0x10,
-    OMX_VIDEO_MPEG4ProfileScalableTexture  = 0x20,
-    OMX_VIDEO_MPEG4ProfileSimpleFace       = 0x40,
-    OMX_VIDEO_MPEG4ProfileSimpleFBA        = 0x80,
-    OMX_VIDEO_MPEG4ProfileBasicAnimated    = 0x100,
-    OMX_VIDEO_MPEG4ProfileHybrid           = 0x200,
-    OMX_VIDEO_MPEG4ProfileAdvancedRealTime = 0x400,
-    OMX_VIDEO_MPEG4ProfileCoreScalable     = 0x800,
-    OMX_VIDEO_MPEG4ProfileAdvancedCoding   = 0x1000,
-    OMX_VIDEO_MPEG4ProfileAdvancedCore     = 0x2000,
-    OMX_VIDEO_MPEG4ProfileAdvancedScalable = 0x4000,
-    OMX_VIDEO_MPEG4ProfileAdvancedSimple   = 0x8000,
-    OMX_VIDEO_MPEG4ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_MPEG4ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_MPEG4ProfileMax              = 0x7FFFFFFF
-} OMX_VIDEO_MPEG4PROFILETYPE;
-
-
-/**
- * MPEG-4 level types, each level indicates support for various frame
- * sizes, bit rates, decoder frame rates.  No need
- */
-typedef enum OMX_VIDEO_MPEG4LEVELTYPE {
-    OMX_VIDEO_MPEG4Level0  = 0x01,   /**< Level 0 */
-    OMX_VIDEO_MPEG4Level0b = 0x02,   /**< Level 0b */
-    OMX_VIDEO_MPEG4Level1  = 0x04,   /**< Level 1 */
-    OMX_VIDEO_MPEG4Level2  = 0x08,   /**< Level 2 */
-    OMX_VIDEO_MPEG4Level3  = 0x10,   /**< Level 3 */
-    /* normally levels are powers of 2s, but 3b was missed and levels must be properly ordered */
-    OMX_VIDEO_MPEG4Level3b = 0x18,   /**< Level 3a */
-    OMX_VIDEO_MPEG4Level4  = 0x20,   /**< Level 4 */
-    OMX_VIDEO_MPEG4Level4a = 0x40,   /**< Level 4a */
-    OMX_VIDEO_MPEG4Level5  = 0x80,   /**< Level 5 */
-    OMX_VIDEO_MPEG4Level6  = 0x100,  /**< Level 6 */
-    OMX_VIDEO_MPEG4LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_MPEG4LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_MPEG4LevelMax = 0x7FFFFFFF
-} OMX_VIDEO_MPEG4LEVELTYPE;
-
-
-/**
- * MPEG-4 configuration.  This structure handles configuration options
- * which are specific to MPEG4 algorithms
- *
- * STRUCT MEMBERS:
- *  nSize                : Size of the structure in bytes
- *  nVersion             : OMX specification version information
- *  nPortIndex           : Port that this structure applies to
- *  nSliceHeaderSpacing  : Number of macroblocks between slice header (H263+
- *                         Annex K). Put zero if not used
- *  bSVH                 : Enable Short Video Header mode
- *  bGov                 : Flag to enable GOV
- *  nPFrames             : Number of P frames between each I frame (also called
- *                         GOV period)
- *  nBFrames             : Number of B frames between each I frame
- *  nIDCVLCThreshold     : Value of intra DC VLC threshold
- *  bACPred              : Flag to use ac prediction
- *  nMaxPacketSize       : Maximum size of packet in bytes.
- *  nTimeIncRes          : Used to pass VOP time increment resolution for MPEG4.
- *                         Interpreted as described in MPEG4 standard.
- *  eProfile             : MPEG-4 profile(s) to use.
- *  eLevel               : MPEG-4 level(s) to use.
- *  nAllowedPictureTypes : Specifies the picture types allowed in the bitstream
- *  nHeaderExtension     : Specifies the number of consecutive video packet
- *                         headers within a VOP
- *  bReversibleVLC       : Specifies whether reversible variable length coding
- *                         is in use
- */
-typedef struct OMX_VIDEO_PARAM_MPEG4TYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nSliceHeaderSpacing;
-    OMX_BOOL bSVH;
-    OMX_BOOL bGov;
-    OMX_U32 nPFrames;
-    OMX_U32 nBFrames;
-    OMX_U32 nIDCVLCThreshold;
-    OMX_BOOL bACPred;
-    OMX_U32 nMaxPacketSize;
-    OMX_U32 nTimeIncRes;
-    OMX_VIDEO_MPEG4PROFILETYPE eProfile;
-    OMX_VIDEO_MPEG4LEVELTYPE eLevel;
-    OMX_U32 nAllowedPictureTypes;
-    OMX_U32 nHeaderExtension;
-    OMX_BOOL bReversibleVLC;
-} OMX_VIDEO_PARAM_MPEG4TYPE;
-
-
-/**
- * WMV Versions
- */
-typedef enum OMX_VIDEO_WMVFORMATTYPE {
-    OMX_VIDEO_WMVFormatUnused = 0x01,   /**< Format unused or unknown */
-    OMX_VIDEO_WMVFormat7      = 0x02,   /**< Windows Media Video format 7 */
-    OMX_VIDEO_WMVFormat8      = 0x04,   /**< Windows Media Video format 8 */
-    OMX_VIDEO_WMVFormat9      = 0x08,   /**< Windows Media Video format 9 */
-    OMX_VIDEO_WMFFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_WMFFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_WMVFormatMax    = 0x7FFFFFFF
-} OMX_VIDEO_WMVFORMATTYPE;
-
-
-/**
- * WMV Params
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  eFormat    : Version of WMV stream / data
- */
-typedef struct OMX_VIDEO_PARAM_WMVTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_WMVFORMATTYPE eFormat;
-} OMX_VIDEO_PARAM_WMVTYPE;
-
-
-/**
- * Real Video Version
- */
-typedef enum OMX_VIDEO_RVFORMATTYPE {
-    OMX_VIDEO_RVFormatUnused = 0, /**< Format unused or unknown */
-    OMX_VIDEO_RVFormat8,          /**< Real Video format 8 */
-    OMX_VIDEO_RVFormat9,          /**< Real Video format 9 */
-    OMX_VIDEO_RVFormatG2,         /**< Real Video Format G2 */
-    OMX_VIDEO_RVFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_RVFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_RVFormatMax = 0x7FFFFFFF
-} OMX_VIDEO_RVFORMATTYPE;
-
-
-/**
- * Real Video Params
- *
- * STUCT MEMBERS:
- *  nSize              : Size of the structure in bytes
- *  nVersion           : OMX specification version information
- *  nPortIndex         : Port that this structure applies to
- *  eFormat            : Version of RV stream / data
- *  nBitsPerPixel      : Bits per pixel coded in the frame
- *  nPaddedWidth       : Padded width in pixel of a video frame
- *  nPaddedHeight      : Padded Height in pixels of a video frame
- *  nFrameRate         : Rate of video in frames per second
- *  nBitstreamFlags    : Flags which internal information about the bitstream
- *  nBitstreamVersion  : Bitstream version
- *  nMaxEncodeFrameSize: Max encoded frame size
- *  bEnablePostFilter  : Turn on/off post filter
- *  bEnableTemporalInterpolation : Turn on/off temporal interpolation
- *  bEnableLatencyMode : When enabled, the decoder does not display a decoded
- *                       frame until it has detected that no enhancement layer
- *                       frames or dependent B frames will be coming. This
- *                       detection usually occurs when a subsequent non-B
- *                       frame is encountered
- */
-typedef struct OMX_VIDEO_PARAM_RVTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_RVFORMATTYPE eFormat;
-    OMX_U16 nBitsPerPixel;
-    OMX_U16 nPaddedWidth;
-    OMX_U16 nPaddedHeight;
-    OMX_U32 nFrameRate;
-    OMX_U32 nBitstreamFlags;
-    OMX_U32 nBitstreamVersion;
-    OMX_U32 nMaxEncodeFrameSize;
-    OMX_BOOL bEnablePostFilter;
-    OMX_BOOL bEnableTemporalInterpolation;
-    OMX_BOOL bEnableLatencyMode;
-} OMX_VIDEO_PARAM_RVTYPE;
-
-
-/**
- * AVC profile types, each profile indicates support for various
- * performance bounds and different annexes.
- */
-typedef enum OMX_VIDEO_AVCPROFILETYPE {
-    OMX_VIDEO_AVCProfileBaseline = 0x01,   /**< Baseline profile */
-    OMX_VIDEO_AVCProfileMain     = 0x02,   /**< Main profile */
-    OMX_VIDEO_AVCProfileExtended = 0x04,   /**< Extended profile */
-    OMX_VIDEO_AVCProfileHigh     = 0x08,   /**< High profile */
-    OMX_VIDEO_AVCProfileHigh10   = 0x10,   /**< High 10 profile */
-    OMX_VIDEO_AVCProfileHigh422  = 0x20,   /**< High 4:2:2 profile */
-    OMX_VIDEO_AVCProfileHigh444  = 0x40,   /**< High 4:4:4 profile */
-    OMX_VIDEO_AVCProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_AVCProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_AVCProfileMax      = 0x7FFFFFFF
-} OMX_VIDEO_AVCPROFILETYPE;
-
-
-/**
- * AVC level types, each level indicates support for various frame sizes,
- * bit rates, decoder frame rates.  No need
- */
-typedef enum OMX_VIDEO_AVCLEVELTYPE {
-    OMX_VIDEO_AVCLevel1   = 0x01,     /**< Level 1 */
-    OMX_VIDEO_AVCLevel1b  = 0x02,     /**< Level 1b */
-    OMX_VIDEO_AVCLevel11  = 0x04,     /**< Level 1.1 */
-    OMX_VIDEO_AVCLevel12  = 0x08,     /**< Level 1.2 */
-    OMX_VIDEO_AVCLevel13  = 0x10,     /**< Level 1.3 */
-    OMX_VIDEO_AVCLevel2   = 0x20,     /**< Level 2 */
-    OMX_VIDEO_AVCLevel21  = 0x40,     /**< Level 2.1 */
-    OMX_VIDEO_AVCLevel22  = 0x80,     /**< Level 2.2 */
-    OMX_VIDEO_AVCLevel3   = 0x100,    /**< Level 3 */
-    OMX_VIDEO_AVCLevel31  = 0x200,    /**< Level 3.1 */
-    OMX_VIDEO_AVCLevel32  = 0x400,    /**< Level 3.2 */
-    OMX_VIDEO_AVCLevel4   = 0x800,    /**< Level 4 */
-    OMX_VIDEO_AVCLevel41  = 0x1000,   /**< Level 4.1 */
-    OMX_VIDEO_AVCLevel42  = 0x2000,   /**< Level 4.2 */
-    OMX_VIDEO_AVCLevel5   = 0x4000,   /**< Level 5 */
-    OMX_VIDEO_AVCLevel51  = 0x8000,   /**< Level 5.1 */
-    OMX_VIDEO_AVCLevel52  = 0x10000,  /**< Level 5.2 */
-    OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_AVCLevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF
-} OMX_VIDEO_AVCLEVELTYPE;
-
-
-/**
- * AVC loop filter modes
- *
- * OMX_VIDEO_AVCLoopFilterEnable               : Enable
- * OMX_VIDEO_AVCLoopFilterDisable              : Disable
- * OMX_VIDEO_AVCLoopFilterDisableSliceBoundary : Disabled on slice boundaries
- */
-typedef enum OMX_VIDEO_AVCLOOPFILTERTYPE {
-    OMX_VIDEO_AVCLoopFilterEnable = 0,
-    OMX_VIDEO_AVCLoopFilterDisable,
-    OMX_VIDEO_AVCLoopFilterDisableSliceBoundary,
-    OMX_VIDEO_AVCLoopFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_AVCLoopFilterVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_AVCLoopFilterMax = 0x7FFFFFFF
-} OMX_VIDEO_AVCLOOPFILTERTYPE;
-
-
-/**
- * AVC params
- *
- * STRUCT MEMBERS:
- *  nSize                     : Size of the structure in bytes
- *  nVersion                  : OMX specification version information
- *  nPortIndex                : Port that this structure applies to
- *  nSliceHeaderSpacing       : Number of macroblocks between slice header, put
- *                              zero if not used
- *  nPFrames                  : Number of P frames between each I frame
- *  nBFrames                  : Number of B frames between each I frame
- *  bUseHadamard              : Enable/disable Hadamard transform
- *  nRefFrames                : Max number of reference frames to use for inter
- *                              motion search (1-16)
- *  nRefIdxTrailing           : Pic param set ref frame index (index into ref
- *                              frame buffer of trailing frames list), B frame
- *                              support
- *  nRefIdxForward            : Pic param set ref frame index (index into ref
- *                              frame buffer of forward frames list), B frame
- *                              support
- *  bEnableUEP                : Enable/disable unequal error protection. This
- *                              is only valid of data partitioning is enabled.
- *  bEnableFMO                : Enable/disable flexible macroblock ordering
- *  bEnableASO                : Enable/disable arbitrary slice ordering
- *  bEnableRS                 : Enable/disable sending of redundant slices
- *  eProfile                  : AVC profile(s) to use
- *  eLevel                    : AVC level(s) to use
- *  nAllowedPictureTypes      : Specifies the picture types allowed in the
- *                              bitstream
- *  bFrameMBsOnly             : specifies that every coded picture of the
- *                              coded video sequence is a coded frame
- *                              containing only frame macroblocks
- *  bMBAFF                    : Enable/disable switching between frame and
- *                              field macroblocks within a picture
- *  bEntropyCodingCABAC       : Entropy decoding method to be applied for the
- *                              syntax elements for which two descriptors appear
- *                              in the syntax tables
- *  bWeightedPPrediction      : Enable/disable weighted prediction shall not
- *                              be applied to P and SP slices
- *  nWeightedBipredicitonMode : Default weighted prediction is applied to B
- *                              slices
- *  bconstIpred               : Enable/disable intra prediction
- *  bDirect8x8Inference       : Specifies the method used in the derivation
- *                              process for luma motion vectors for B_Skip,
- *                              B_Direct_16x16 and B_Direct_8x8 as specified
- *                              in subclause 8.4.1.2 of the AVC spec
- *  bDirectSpatialTemporal    : Flag indicating spatial or temporal direct
- *                              mode used in B slice coding (related to
- *                              bDirect8x8Inference) . Spatial direct mode is
- *                              more common and should be the default.
- *  nCabacInitIdx             : Index used to init CABAC contexts
- *  eLoopFilterMode           : Enable/disable loop filter
- */
-typedef struct OMX_VIDEO_PARAM_AVCTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nSliceHeaderSpacing;
-    OMX_U32 nPFrames;
-    OMX_U32 nBFrames;
-    OMX_BOOL bUseHadamard;
-    OMX_U32 nRefFrames;
-    OMX_U32 nRefIdx10ActiveMinus1;
-    OMX_U32 nRefIdx11ActiveMinus1;
-    OMX_BOOL bEnableUEP;
-    OMX_BOOL bEnableFMO;
-    OMX_BOOL bEnableASO;
-    OMX_BOOL bEnableRS;
-    OMX_VIDEO_AVCPROFILETYPE eProfile;
-    OMX_VIDEO_AVCLEVELTYPE eLevel;
-    OMX_U32 nAllowedPictureTypes;
-    OMX_BOOL bFrameMBsOnly;
-    OMX_BOOL bMBAFF;
-    OMX_BOOL bEntropyCodingCABAC;
-    OMX_BOOL bWeightedPPrediction;
-    OMX_U32 nWeightedBipredicitonMode;
-    OMX_BOOL bconstIpred ;
-    OMX_BOOL bDirect8x8Inference;
-    OMX_BOOL bDirectSpatialTemporal;
-    OMX_U32 nCabacInitIdc;
-    OMX_VIDEO_AVCLOOPFILTERTYPE eLoopFilterMode;
-} OMX_VIDEO_PARAM_AVCTYPE;
-
-typedef struct OMX_VIDEO_PARAM_PROFILELEVELTYPE {
-   OMX_U32 nSize;
-   OMX_VERSIONTYPE nVersion;
-   OMX_U32 nPortIndex;
-   OMX_U32 eProfile;      /**< type is OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263PROFILETYPE,
-                                 or OMX_VIDEO_MPEG4PROFILETYPE depending on context */
-   OMX_U32 eLevel;        /**< type is OMX_VIDEO_AVCLEVELTYPE, OMX_VIDEO_H263LEVELTYPE,
-                                 or OMX_VIDEO_MPEG4PROFILETYPE depending on context */
-   OMX_U32 nProfileIndex; /**< Used to query for individual profile support information,
-                               This parameter is valid only for
-                               OMX_IndexParamVideoProfileLevelQuerySupported index,
-                               For all other indices this parameter is to be ignored. */
-} OMX_VIDEO_PARAM_PROFILELEVELTYPE;
-
-/**
- * Structure for dynamically configuring bitrate mode of a codec.
- *
- * STRUCT MEMBERS:
- *  nSize          : Size of the struct in bytes
- *  nVersion       : OMX spec version info
- *  nPortIndex     : Port that this struct applies to
- *  nEncodeBitrate : Target average bitrate to be generated in bps
- */
-typedef struct OMX_VIDEO_CONFIG_BITRATETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nEncodeBitrate;
-} OMX_VIDEO_CONFIG_BITRATETYPE;
-
-/**
- * Defines Encoder Frame Rate setting
- *
- * STRUCT MEMBERS:
- *  nSize            : Size of the structure in bytes
- *  nVersion         : OMX specification version information
- *  nPortIndex       : Port that this structure applies to
- *  xEncodeFramerate : Encoding framerate represented in Q16 format
- */
-typedef struct OMX_CONFIG_FRAMERATETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 xEncodeFramerate; /* Q16 format */
-} OMX_CONFIG_FRAMERATETYPE;
-
-typedef struct OMX_CONFIG_INTRAREFRESHVOPTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL IntraRefreshVOP;
-} OMX_CONFIG_INTRAREFRESHVOPTYPE;
-
-typedef struct OMX_CONFIG_MACROBLOCKERRORMAPTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nErrMapSize;           /* Size of the Error Map in bytes */
-    OMX_U8  ErrMap[1];             /* Error map hint */
-} OMX_CONFIG_MACROBLOCKERRORMAPTYPE;
-
-typedef struct OMX_CONFIG_MBERRORREPORTINGTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bEnabled;
-} OMX_CONFIG_MBERRORREPORTINGTYPE;
-
-typedef struct OMX_PARAM_MACROBLOCKSTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nMacroblocks;
-} OMX_PARAM_MACROBLOCKSTYPE;
-
-/**
- * AVC Slice Mode modes
- *
- * OMX_VIDEO_SLICEMODE_AVCDefault   : Normal frame encoding, one slice per frame
- * OMX_VIDEO_SLICEMODE_AVCMBSlice   : NAL mode, number of MBs per frame
- * OMX_VIDEO_SLICEMODE_AVCByteSlice : NAL mode, number of bytes per frame
- */
-typedef enum OMX_VIDEO_AVCSLICEMODETYPE {
-    OMX_VIDEO_SLICEMODE_AVCDefault = 0,
-    OMX_VIDEO_SLICEMODE_AVCMBSlice,
-    OMX_VIDEO_SLICEMODE_AVCByteSlice,
-    OMX_VIDEO_SLICEMODE_AVCKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
-    OMX_VIDEO_SLICEMODE_AVCVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
-    OMX_VIDEO_SLICEMODE_AVCLevelMax = 0x7FFFFFFF
-} OMX_VIDEO_AVCSLICEMODETYPE;
-
-/**
- * AVC FMO Slice Mode Params
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nNumSliceGroups : Specifies the number of slice groups
- *  nSliceGroupMapType : Specifies the type of slice groups
- *  eSliceMode : Specifies the type of slice
- */
-typedef struct OMX_VIDEO_PARAM_AVCSLICEFMO {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U8 nNumSliceGroups;
-    OMX_U8 nSliceGroupMapType;
-    OMX_VIDEO_AVCSLICEMODETYPE eSliceMode;
-} OMX_VIDEO_PARAM_AVCSLICEFMO;
-
-/**
- * AVC IDR Period Configs
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nIDRPeriod : Specifies periodicity of IDR frames
- *  nPFrames : Specifies internal of coding Intra frames
- */
-typedef struct OMX_VIDEO_CONFIG_AVCINTRAPERIOD {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nIDRPeriod;
-    OMX_U32 nPFrames;
-} OMX_VIDEO_CONFIG_AVCINTRAPERIOD;
-
-/**
- * AVC NAL Size Configs
- *
- * STRUCT MEMBERS:
- *  nSize      : Size of the structure in bytes
- *  nVersion   : OMX specification version information
- *  nPortIndex : Port that this structure applies to
- *  nNaluBytes : Specifies the NAL unit size
- */
-typedef struct OMX_VIDEO_CONFIG_NALSIZE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nNaluBytes;
-} OMX_VIDEO_CONFIG_NALSIZE;
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-/* File EOF */
-
diff --git a/include/media/openmax/OMX_VideoExt.h b/include/media/openmax/OMX_VideoExt.h
deleted file mode 100644
index 128dd2d1da..0000000000
--- a/include/media/openmax/OMX_VideoExt.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Copyright (c) 2010 The Khronos Group Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject
- * to the following conditions:
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-/** OMX_VideoExt.h - OpenMax IL version 1.1.2
- * The OMX_VideoExt header file contains extensions to the
- * definitions used by both the application and the component to
- * access video items.
- */
-
-#ifndef OMX_VideoExt_h
-#define OMX_VideoExt_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Each OMX header shall 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_Core.h>
-
-/** NALU Formats */
-typedef enum OMX_NALUFORMATSTYPE {
-    OMX_NaluFormatStartCodes = 1,
-    OMX_NaluFormatOneNaluPerBuffer = 2,
-    OMX_NaluFormatOneByteInterleaveLength = 4,
-    OMX_NaluFormatTwoByteInterleaveLength = 8,
-    OMX_NaluFormatFourByteInterleaveLength = 16,
-    OMX_NaluFormatCodingMax = 0x7FFFFFFF
-} OMX_NALUFORMATSTYPE;
-
-/** NAL Stream Format */
-typedef struct OMX_NALSTREAMFORMATTYPE{
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_NALUFORMATSTYPE eNaluFormat;
-} OMX_NALSTREAMFORMATTYPE;
-
-/** VP8 profiles */
-typedef enum OMX_VIDEO_VP8PROFILETYPE {
-    OMX_VIDEO_VP8ProfileMain = 0x01,
-    OMX_VIDEO_VP8ProfileUnknown = 0x6EFFFFFF,
-    OMX_VIDEO_VP8ProfileMax = 0x7FFFFFFF
-} OMX_VIDEO_VP8PROFILETYPE;
-
-/** VP8 levels */
-typedef enum OMX_VIDEO_VP8LEVELTYPE {
-    OMX_VIDEO_VP8Level_Version0 = 0x01,
-    OMX_VIDEO_VP8Level_Version1 = 0x02,
-    OMX_VIDEO_VP8Level_Version2 = 0x04,
-    OMX_VIDEO_VP8Level_Version3 = 0x08,
-    OMX_VIDEO_VP8LevelUnknown = 0x6EFFFFFF,
-    OMX_VIDEO_VP8LevelMax = 0x7FFFFFFF
-} OMX_VIDEO_VP8LEVELTYPE;
-
-/** VP8 Param */
-typedef struct OMX_VIDEO_PARAM_VP8TYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_VP8PROFILETYPE eProfile;
-    OMX_VIDEO_VP8LEVELTYPE eLevel;
-    OMX_U32 nDCTPartitions;
-    OMX_BOOL bErrorResilientMode;
-} OMX_VIDEO_PARAM_VP8TYPE;
-
-/** Structure for configuring VP8 reference frames */
-typedef struct OMX_VIDEO_VP8REFERENCEFRAMETYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bPreviousFrameRefresh;
-    OMX_BOOL bGoldenFrameRefresh;
-    OMX_BOOL bAlternateFrameRefresh;
-    OMX_BOOL bUsePreviousFrame;
-    OMX_BOOL bUseGoldenFrame;
-    OMX_BOOL bUseAlternateFrame;
-} OMX_VIDEO_VP8REFERENCEFRAMETYPE;
-
-/** Structure for querying VP8 reference frame type */
-typedef struct OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bIsIntraFrame;
-    OMX_BOOL bIsGoldenOrAlternateFrame;
-} OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE;
-
-/** Maximum number of VP8 temporal layers */
-#define OMX_VIDEO_ANDROID_MAXVP8TEMPORALLAYERS 3
-
-/** VP8 temporal layer patterns */
-typedef enum OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE {
-    OMX_VIDEO_VPXTemporalLayerPatternNone = 0,
-    OMX_VIDEO_VPXTemporalLayerPatternWebRTC = 1,
-    OMX_VIDEO_VPXTemporalLayerPatternMax = 0x7FFFFFFF
-} OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE;
-
-/**
- * Android specific VP8/VP9 encoder params
- *
- * STRUCT MEMBERS:
- *  nSize                      : Size of the structure in bytes
- *  nVersion                   : OMX specification version information
- *  nPortIndex                 : Port that this structure applies to
- *  nKeyFrameInterval          : Key frame interval in frames
- *  eTemporalPattern           : Type of temporal layer pattern
- *  nTemporalLayerCount        : Number of temporal coding layers
- *  nTemporalLayerBitrateRatio : Bitrate ratio allocation between temporal
- *                               streams in percentage
- *  nMinQuantizer              : Minimum (best quality) quantizer
- *  nMaxQuantizer              : Maximum (worst quality) quantizer
- */
-typedef struct OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nKeyFrameInterval;        // distance between consecutive key_frames (including one
-                                      // of the key_frames). 0 means interval is unspecified and
-                                      // can be freely chosen by the codec. 1 means a stream of
-                                      // only key_frames.
-
-    OMX_VIDEO_ANDROID_VPXTEMPORALLAYERPATTERNTYPE eTemporalPattern;
-    OMX_U32 nTemporalLayerCount;
-    OMX_U32 nTemporalLayerBitrateRatio[OMX_VIDEO_ANDROID_MAXVP8TEMPORALLAYERS];
-    OMX_U32 nMinQuantizer;
-    OMX_U32 nMaxQuantizer;
-} OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE;
-
-/** VP9 profiles */
-typedef enum OMX_VIDEO_VP9PROFILETYPE {
-    OMX_VIDEO_VP9Profile0 = 0x1,
-    OMX_VIDEO_VP9Profile1 = 0x2,
-    OMX_VIDEO_VP9Profile2 = 0x4,
-    OMX_VIDEO_VP9Profile3 = 0x8,
-    // HDR profiles also support passing HDR metadata
-    OMX_VIDEO_VP9Profile2HDR = 0x1000,
-    OMX_VIDEO_VP9Profile3HDR = 0x2000,
-    OMX_VIDEO_VP9ProfileUnknown = 0x6EFFFFFF,
-    OMX_VIDEO_VP9ProfileMax = 0x7FFFFFFF
-} OMX_VIDEO_VP9PROFILETYPE;
-
-/** VP9 levels */
-typedef enum OMX_VIDEO_VP9LEVELTYPE {
-    OMX_VIDEO_VP9Level1  = 0x0,
-    OMX_VIDEO_VP9Level11 = 0x1,
-    OMX_VIDEO_VP9Level2  = 0x2,
-    OMX_VIDEO_VP9Level21 = 0x4,
-    OMX_VIDEO_VP9Level3  = 0x8,
-    OMX_VIDEO_VP9Level31 = 0x10,
-    OMX_VIDEO_VP9Level4  = 0x20,
-    OMX_VIDEO_VP9Level41 = 0x40,
-    OMX_VIDEO_VP9Level5  = 0x80,
-    OMX_VIDEO_VP9Level51 = 0x100,
-    OMX_VIDEO_VP9Level52 = 0x200,
-    OMX_VIDEO_VP9Level6  = 0x400,
-    OMX_VIDEO_VP9Level61 = 0x800,
-    OMX_VIDEO_VP9Level62 = 0x1000,
-    OMX_VIDEO_VP9LevelUnknown = 0x6EFFFFFF,
-    OMX_VIDEO_VP9LevelMax = 0x7FFFFFFF
-} OMX_VIDEO_VP9LEVELTYPE;
-
-/**
-* VP9 Parameters.
-*   Encoder specific parameters (decoders should ignore these fields):
-*     - bErrorResilientMode
-*     - nTileRows
-*     - nTileColumns
-*     - bEnableFrameParallelDecoding
-*/
-typedef struct OMX_VIDEO_PARAM_VP9TYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_VP9PROFILETYPE eProfile;
-    OMX_VIDEO_VP9LEVELTYPE eLevel;
-    OMX_BOOL bErrorResilientMode;
-    OMX_U32 nTileRows;
-    OMX_U32 nTileColumns;
-    OMX_BOOL bEnableFrameParallelDecoding;
-} OMX_VIDEO_PARAM_VP9TYPE;
-
-/** HEVC Profile enum type */
-typedef enum OMX_VIDEO_HEVCPROFILETYPE {
-    OMX_VIDEO_HEVCProfileUnknown      = 0x0,
-    OMX_VIDEO_HEVCProfileMain         = 0x1,
-    OMX_VIDEO_HEVCProfileMain10       = 0x2,
-    // Main10 profile with HDR SEI support.
-    OMX_VIDEO_HEVCProfileMain10HDR10  = 0x1000,
-    OMX_VIDEO_HEVCProfileMax          = 0x7FFFFFFF
-} OMX_VIDEO_HEVCPROFILETYPE;
-
-/** HEVC Level enum type */
-typedef enum OMX_VIDEO_HEVCLEVELTYPE {
-    OMX_VIDEO_HEVCLevelUnknown    = 0x0,
-    OMX_VIDEO_HEVCMainTierLevel1  = 0x1,
-    OMX_VIDEO_HEVCHighTierLevel1  = 0x2,
-    OMX_VIDEO_HEVCMainTierLevel2  = 0x4,
-    OMX_VIDEO_HEVCHighTierLevel2  = 0x8,
-    OMX_VIDEO_HEVCMainTierLevel21 = 0x10,
-    OMX_VIDEO_HEVCHighTierLevel21 = 0x20,
-    OMX_VIDEO_HEVCMainTierLevel3  = 0x40,
-    OMX_VIDEO_HEVCHighTierLevel3  = 0x80,
-    OMX_VIDEO_HEVCMainTierLevel31 = 0x100,
-    OMX_VIDEO_HEVCHighTierLevel31 = 0x200,
-    OMX_VIDEO_HEVCMainTierLevel4  = 0x400,
-    OMX_VIDEO_HEVCHighTierLevel4  = 0x800,
-    OMX_VIDEO_HEVCMainTierLevel41 = 0x1000,
-    OMX_VIDEO_HEVCHighTierLevel41 = 0x2000,
-    OMX_VIDEO_HEVCMainTierLevel5  = 0x4000,
-    OMX_VIDEO_HEVCHighTierLevel5  = 0x8000,
-    OMX_VIDEO_HEVCMainTierLevel51 = 0x10000,
-    OMX_VIDEO_HEVCHighTierLevel51 = 0x20000,
-    OMX_VIDEO_HEVCMainTierLevel52 = 0x40000,
-    OMX_VIDEO_HEVCHighTierLevel52 = 0x80000,
-    OMX_VIDEO_HEVCMainTierLevel6  = 0x100000,
-    OMX_VIDEO_HEVCHighTierLevel6  = 0x200000,
-    OMX_VIDEO_HEVCMainTierLevel61 = 0x400000,
-    OMX_VIDEO_HEVCHighTierLevel61 = 0x800000,
-    OMX_VIDEO_HEVCMainTierLevel62 = 0x1000000,
-    OMX_VIDEO_HEVCHighTierLevel62 = 0x2000000,
-    OMX_VIDEO_HEVCHighTiermax     = 0x7FFFFFFF
-} OMX_VIDEO_HEVCLEVELTYPE;
-
-/** Structure for controlling HEVC video encoding */
-typedef struct OMX_VIDEO_PARAM_HEVCTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_HEVCPROFILETYPE eProfile;
-    OMX_VIDEO_HEVCLEVELTYPE eLevel;
-    OMX_U32 nKeyFrameInterval;        // distance between consecutive I-frames (including one
-                                      // of the I frames). 0 means interval is unspecified and
-                                      // can be freely chosen by the codec. 1 means a stream of
-                                      // only I frames.
-} OMX_VIDEO_PARAM_HEVCTYPE;
-
-/** Structure to define if dependent slice segments should be used */
-typedef struct OMX_VIDEO_SLICESEGMENTSTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_BOOL bDepedentSegments;
-    OMX_BOOL bEnableLoopFilterAcrossSlices;
-} OMX_VIDEO_SLICESEGMENTSTYPE;
-
-/** Structure to return timestamps of rendered output frames as well as EOS
- *  for tunneled components.
- */
-typedef struct OMX_VIDEO_RENDEREVENTTYPE {
-    OMX_S64 nMediaTimeUs;  // timestamp of rendered video frame
-    OMX_S64 nSystemTimeNs; // system monotonic time at the time frame was rendered
-                           // Use INT64_MAX for nMediaTimeUs to signal that the EOS
-                           // has been reached. In this case, nSystemTimeNs MUST be
-                           // the system time when the last frame was rendered.
-                           // This MUST be done in addition to returning (and
-                           // following) the render information for the last frame.
-} OMX_VIDEO_RENDEREVENTTYPE;
-
-/** Dolby Vision Profile enum type */
-typedef enum OMX_VIDEO_DOLBYVISIONPROFILETYPE {
-    OMX_VIDEO_DolbyVisionProfileUnknown = 0x0,
-    OMX_VIDEO_DolbyVisionProfileDvavPer = 0x1,
-    OMX_VIDEO_DolbyVisionProfileDvavPen = 0x2,
-    OMX_VIDEO_DolbyVisionProfileDvheDer = 0x4,
-    OMX_VIDEO_DolbyVisionProfileDvheDen = 0x8,
-    OMX_VIDEO_DolbyVisionProfileDvheDtr = 0x10,
-    OMX_VIDEO_DolbyVisionProfileDvheStn = 0x20,
-    OMX_VIDEO_DolbyVisionProfileDvheDth = 0x40,
-    OMX_VIDEO_DolbyVisionProfileDvheDtb = 0x80,
-    OMX_VIDEO_DolbyVisionProfileMax     = 0x7FFFFFFF
-} OMX_VIDEO_DOLBYVISIONPROFILETYPE;
-
-/** Dolby Vision Level enum type */
-typedef enum OMX_VIDEO_DOLBYVISIONLEVELTYPE {
-    OMX_VIDEO_DolbyVisionLevelUnknown = 0x0,
-    OMX_VIDEO_DolbyVisionLevelHd24    = 0x1,
-    OMX_VIDEO_DolbyVisionLevelHd30    = 0x2,
-    OMX_VIDEO_DolbyVisionLevelFhd24   = 0x4,
-    OMX_VIDEO_DolbyVisionLevelFhd30   = 0x8,
-    OMX_VIDEO_DolbyVisionLevelFhd60   = 0x10,
-    OMX_VIDEO_DolbyVisionLevelUhd24   = 0x20,
-    OMX_VIDEO_DolbyVisionLevelUhd30   = 0x40,
-    OMX_VIDEO_DolbyVisionLevelUhd48   = 0x80,
-    OMX_VIDEO_DolbyVisionLevelUhd60   = 0x100,
-    OMX_VIDEO_DolbyVisionLevelmax     = 0x7FFFFFFF
-} OMX_VIDEO_DOLBYVISIONLEVELTYPE;
-
-/**
- * Structure for configuring video compression intra refresh period
- *
- * STRUCT MEMBERS:
- *  nSize               : Size of the structure in bytes
- *  nVersion            : OMX specification version information
- *  nPortIndex          : Port that this structure applies to
- *  nRefreshPeriod      : Intra refreh period in frames. Value 0 means disable intra refresh
- */
-typedef struct OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_U32 nRefreshPeriod;
-} OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE;
-
-/** Maximum number of temporal layers supported by AVC/HEVC */
-#define OMX_VIDEO_ANDROID_MAXTEMPORALLAYERS 8
-
-/** temporal layer patterns */
-typedef enum OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE {
-    OMX_VIDEO_AndroidTemporalLayeringPatternNone = 0,
-    // pattern as defined by WebRTC
-    OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC = 1 << 0,
-    // pattern where frames in any layer other than the base layer only depend on at most the very
-    // last frame from each preceding layer (other than the base layer.)
-    OMX_VIDEO_AndroidTemporalLayeringPatternAndroid = 1 << 1,
-} OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE;
-
-/**
- * Android specific param for configuration of temporal layering.
- * Android only supports temporal layering where successive layers each double the
- * previous layer's framerate.
- * NOTE: Reading this parameter at run-time SHALL return actual run-time values.
- *
- *  nSize                      : Size of the structure in bytes
- *  nVersion                   : OMX specification version information
- *  nPortIndex                 : Port that this structure applies to (output port for encoders)
- *  eSupportedPatterns         : A bitmask of supported layering patterns
- *  nLayerCountMax             : Max number of temporal coding layers supported
- *                               by the encoder (must be at least 1, 1 meaning temporal layering
- *                               is NOT supported)
- *  nBLayerCountMax            : Max number of layers that can contain B frames
- *                               (0) to (nLayerCountMax - 1)
- *  ePattern                   : Layering pattern.
- *  nPLayerCountActual         : Number of temporal layers to be coded with non-B frames,
- *                               starting from and including the base-layer.
- *                               (1 to nLayerCountMax - nBLayerCountActual)
- *                               If nPLayerCountActual is 1 and nBLayerCountActual is 0, temporal
- *                               layering is disabled. Otherwise, it is enabled.
- *  nBLayerCountActual         : Number of temporal layers to be coded with B frames,
- *                               starting after non-B layers.
- *                               (0 to nBLayerCountMax)
- *  bBitrateRatiosSpecified    : Flag to indicate if layer-wise bitrate
- *                               distribution is specified.
- *  nBitrateRatios             : Bitrate ratio (100 based) per layer (index 0 is base layer).
- *                               Honored if bBitrateRatiosSpecified is set.
- *                               i.e for 4 layers with desired distribution (25% 25% 25% 25%),
- *                               nBitrateRatio = {25, 50, 75, 100, ... }
- *                               Values in indices not less than 'the actual number of layers
- *                               minus 1' MAY be ignored and assumed to be 100.
- */
-typedef struct OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE eSupportedPatterns;
-    OMX_U32 nLayerCountMax;
-    OMX_U32 nBLayerCountMax;
-    OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE ePattern;
-    OMX_U32 nPLayerCountActual;
-    OMX_U32 nBLayerCountActual;
-    OMX_BOOL bBitrateRatiosSpecified;
-    OMX_U32 nBitrateRatios[OMX_VIDEO_ANDROID_MAXTEMPORALLAYERS];
-} OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE;
-
-/**
- * Android specific config for changing the temporal-layer count or
- * bitrate-distribution at run-time.
- *
- *  nSize                      : Size of the structure in bytes
- *  nVersion                   : OMX specification version information
- *  nPortIndex                 : Port that this structure applies to (output port for encoders)
- *  ePattern                   : Layering pattern.
- *  nPLayerCountActual         : Number of temporal layers to be coded with non-B frames.
- *                               (same OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE limits apply.)
- *  nBLayerCountActual         : Number of temporal layers to be coded with B frames.
- *                               (same OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE limits apply.)
- *  bBitrateRatiosSpecified    : Flag to indicate if layer-wise bitrate
- *                               distribution is specified.
- *  nBitrateRatios             : Bitrate ratio (100 based, Q16 values) per layer (0 is base layer).
- *                               Honored if bBitrateRatiosSpecified is set.
- *                               (same OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE limits apply.)
- */
-typedef struct OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE ePattern;
-    OMX_U32 nPLayerCountActual;
-    OMX_U32 nBLayerCountActual;
-    OMX_BOOL bBitrateRatiosSpecified;
-    OMX_U32 nBitrateRatios[OMX_VIDEO_ANDROID_MAXTEMPORALLAYERS];
-} OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* OMX_VideoExt_h */
-/* File EOF */