summaryrefslogtreecommitdiffstats
path: root/domx/omx_core/inc/OMX_IndexExt.h
diff options
context:
space:
mode:
authorZiyan <jaraidaniel@gmail.com>2015-01-31 01:16:50 +0100
committerZiyan <jaraidaniel@gmail.com>2015-04-11 20:24:54 +0200
commit42b930425d4c38acbfc38ec9c5c58aadc5fa31d5 (patch)
tree96bcde2c398d9f452b5f5797c8e88530b81cd42b /domx/omx_core/inc/OMX_IndexExt.h
parent9f961c401ccbb327eccdbb2407d577947801fdcc (diff)
downloaddevice_samsung_tuna-42b930425d4c38acbfc38ec9c5c58aadc5fa31d5.zip
device_samsung_tuna-42b930425d4c38acbfc38ec9c5c58aadc5fa31d5.tar.gz
device_samsung_tuna-42b930425d4c38acbfc38ec9c5c58aadc5fa31d5.tar.bz2
omx: remove duplicate OMX headers and refer to originals where needed
Now that OMX headers in the framework are very closely matched to TI's ENHANCED_DOMX includes, let's remove the duplicates and stop having to update them any time they change (read: FFMPEG changes). Changes: - Remove all duplicate OMX include files under domx/omx_core/inc - Add include locations to frameworks/native/include/media/openmax for: audio camera domx internals libtiutils Thanks to @Hashcode Change-Id: I38af84f45606fba61058b0d04f941a76f76a15e7
Diffstat (limited to 'domx/omx_core/inc/OMX_IndexExt.h')
-rwxr-xr-xdomx/omx_core/inc/OMX_IndexExt.h96
1 files changed, 0 insertions, 96 deletions
diff --git a/domx/omx_core/inc/OMX_IndexExt.h b/domx/omx_core/inc/OMX_IndexExt.h
deleted file mode 100755
index 6cd774b..0000000
--- a/domx/omx_core/inc/OMX_IndexExt.h
+++ /dev/null
@@ -1,96 +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 */
-
- /* 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 */
-
- /* 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 */
-
- /* Image & Video common configurations */
- OMX_IndexExtCommonStartUnused = OMX_IndexKhronosExtensions + 0x00700000,
-
- /* Other configurations */
- OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000,
-
- /* Time configurations */
- OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,
-
- OMX_IndexExtMax = 0x7FFFFFFF
-} OMX_INDEXEXTTYPE;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* OMX_IndexExt_h */
-/* File EOF */