diff options
author | Dan Liang <dan.liang@intel.com> | 2013-05-27 16:26:13 +0800 |
---|---|---|
committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:41 -0700 |
commit | 5427d9de992cd579c5757f70f8f1977390fb74d1 (patch) | |
tree | 6bcd08e5a599e8dcf83467c088c5ffc1c3fb9821 /core/inc | |
parent | 64296f29648d8045b14d235a6fcc4912270c167d (diff) | |
download | wrs_omxil_core-5427d9de992cd579c5757f70f8f1977390fb74d1.tar.gz |
OMX_IndexExt.h is DOS format and needs to be converted to UNIX format
BZ: 111101
It's just a format change.
Change-Id: Ib0d8f50817a12f7d145a58f7c4c34b5eababe725
Signed-off-by: Dan Liang <dan.liang@intel.com>
Reviewed-on: http://android.intel.com:8080/109906
Reviewed-by: Feng, Wei <wei.feng@intel.com>
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'core/inc')
-rw-r--r-- | core/inc/khronos/openmax/include/OMX_IndexExt.h | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/core/inc/khronos/openmax/include/OMX_IndexExt.h b/core/inc/khronos/openmax/include/OMX_IndexExt.h index 85c6638..fbf269a 100644 --- a/core/inc/khronos/openmax/include/OMX_IndexExt.h +++ b/core/inc/khronos/openmax/include/OMX_IndexExt.h @@ -1,88 +1,88 @@ -/*
- * 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,
-
- /* 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_IndexParamVideoBytestream, /**< reference: OMX_VIDEO_PARAM_BYTESTREAMTYPE */
- OMX_IndexParamIntelBitrate, /**< reference: OMX_VIDEO_PARAM_INTEL_BITRATETYPE */
- OMX_IndexConfigIntelBitrate, /**< reference: OMX_VIDEO_CONFIG_INTEL_BITRATETYPE */
- OMX_IndexParamIntelAVCDecodeSettings, /**< reference: OMX_VIDEO_PARAM_INTEL_AVC_DECODE_SETTINGS */
- OMX_IndexConfigIntelSliceNumbers, /**< reference: OMX_VIDEO_CONFIG_INTEL_SLICE_NUMBERS */
- OMX_IndexConfigIntelAIR, /**< reference: OMX_VIDEO_CONFIG_INTEL_AIR */
- OMX_IndexParamIntelAVCVUI, /**< reference: OMX_VIDEO_PARAM_INTEL_AVCVUI */
+/* + * 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, + + /* 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_IndexParamVideoBytestream, /**< reference: OMX_VIDEO_PARAM_BYTESTREAMTYPE */ + OMX_IndexParamIntelBitrate, /**< reference: OMX_VIDEO_PARAM_INTEL_BITRATETYPE */ + OMX_IndexConfigIntelBitrate, /**< reference: OMX_VIDEO_CONFIG_INTEL_BITRATETYPE */ + OMX_IndexParamIntelAVCDecodeSettings, /**< reference: OMX_VIDEO_PARAM_INTEL_AVC_DECODE_SETTINGS */ + OMX_IndexConfigIntelSliceNumbers, /**< reference: OMX_VIDEO_CONFIG_INTEL_SLICE_NUMBERS */ + OMX_IndexConfigIntelAIR, /**< reference: OMX_VIDEO_CONFIG_INTEL_AIR */ + OMX_IndexParamIntelAVCVUI, /**< reference: OMX_VIDEO_PARAM_INTEL_AVCVUI */ OMX_IndexParamIntelAdaptiveSliceControl, /**< reference: OMX_VIDEO_PARAM_INTEL_ADAPTIVE_SLICE_CONTROL */ OMX_IndexStoreMetaDataInBuffers, /**< reference: StoreMetaDataInBuffersParams*/ -
- /* Image & Video common configurations */
+ + /* Image & Video common configurations */ OMX_IndexExtCommonStartUnused = OMX_IndexKhronosExtensions + 0x00700000, -
- /* Other configurations */
+ + /* Other configurations */ OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000, -
- /* Time configurations */
+ + /* Time configurations */ OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000, /* NativeWindow configurations */ @@ -93,10 +93,10 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexExtRotationDegrees, /**<reference: Rotation for decode*/ OMX_IndexExtMax = 0x7FFFFFFF } OMX_INDEXEXTTYPE; -
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* OMX_IndexExt_h */
-/* File EOF */
+ +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* OMX_IndexExt_h */ +/* File EOF */ |