Permalink
Browse files

Added initial_turbo config parameter for forcing turbo from boot.

Added OMX_IndexConfigBrcmAudioDownmixCoefficients for setting custom downmix coefficients.
  • Loading branch information...
1 parent 32227d6 commit 2997db19fbb84721240f1a3ccd09fea4f2f2e0c6 @popcornmix popcornmix committed Sep 23, 2012
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -137,6 +137,8 @@ typedef enum OMX_COLOR_FORMATTYPE {
OMX_COLOR_Format32bitABGR8888,
OMX_COLOR_Format8bitPalette,
OMX_COLOR_FormatYUVUV128,
+ OMX_COLOR_FormatRawBayer12bit,
+ OMX_COLOR_FormatBRCMEGL,
OMX_COLOR_FormatMax = 0x7FFFFFFF
} OMX_COLOR_FORMATTYPE;
@@ -202,7 +202,9 @@ typedef enum OMX_IMAGE_FOCUSCONTROLTYPE {
OMX_IMAGE_FocusControlAutoInfinity, /* CF over distant range (eg 50cm to infinity) */
OMX_IMAGE_FocusControlAutoLockMacro, /* AF over a macro range (eg 0-50cm) */
OMX_IMAGE_FocusControlAutoLockInfinity, /* AF over distant range (eg 50cm to infinity) */
-
+ OMX_IMAGE_FocusControlNearFixed, /* Focus at a fixed near focus point - (50cm-1m) */
+ OMX_IMAGE_FocusControlAutoNear, /* CF over a near range (eg 0-200cm) */
+ OMX_IMAGE_FocusControlAutoLockNear, /* AF over a near range (eg 0-200cm) */
OMX_IMAGE_FocusControlMax = 0x7FFFFFFF
} OMX_IMAGE_FOCUSCONTROLTYPE;
@@ -1,23 +1,23 @@
/*
- * Copyright (c) 2008 The Khronos Group Inc.
- *
+ * 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:
+ * to the following conditions:
* The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
+ * 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.
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
@@ -37,22 +37,22 @@ extern "C" {
/* 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
+ * 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
+ * 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
+ * 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.
@@ -69,11 +69,11 @@ typedef enum OMX_INDEXTYPE {
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_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_IndexParamCustomContentPipe, /**< reference: OMX_PARAM_CONTENTPIPETYPE */
OMX_IndexParamDisableResourceConcealment, /**< reference: OMX_RESOURCECONCEALMENTTYPE */
OMX_IndexConfigMetadataItemCount, /**< reference: OMX_CONFIG_METADATAITEMCOUNTTYPE */
OMX_IndexConfigContainerNodeCount, /**< reference: OMX_CONFIG_CONTAINERNODECOUNTTYPE */
@@ -86,7 +86,7 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexPortStartUnused = 0x02000000,
OMX_IndexParamPortDefinition, /**< reference: OMX_PARAM_PORTDEFINITIONTYPE */
- OMX_IndexParamCompBufferSupplier, /**< reference: OMX_PARAM_BUFFERSUPPLIERTYPE */
+ OMX_IndexParamCompBufferSupplier, /**< reference: OMX_PARAM_BUFFERSUPPLIERTYPE */
OMX_IndexReservedStartUnused = 0x03000000,
/* Audio parameters and configurations */
@@ -238,10 +238,10 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexConfigTimeSeekMode, /**< reference: OMX_TIME_CONFIG_SEEKMODETYPE */
- OMX_IndexKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
+ 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
+ /* 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. */
@@ -251,21 +251,21 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexParamPortSummary, /**< reference: OMX_PARAM_PORTSUMMARYTYPE */
OMX_IndexParamTunnelStatus, /**< reference : OMX_PARAM_TUNNELSTATUSTYPE */
OMX_IndexParamBrcmRecursionUnsafe, /**< reference: OMX_PARAM_BRCMRECURSIONUNSAFETYPE */
-
+
/* used for top-ril communication */
OMX_IndexParamBufferAddress, /**< reference : OMX_PARAM_BUFFERADDRESSTYPE */
OMX_IndexParamTunnelSetup, /**< reference : OMX_PARAM_TUNNELSETUPTYPE */
- OMX_IndexParamBrcmPortEGL, /**< reference : OMX_PARAM_BRCMPORTEGLTYPE */
+ OMX_IndexParamBrcmPortEGL, /**< reference : OMX_PARAM_BRCMPORTEGLTYPE */
OMX_IndexParamIdleResourceCount, /**< reference : OMX_PARAM_U32TYPE */
-
+
/* used for ril-ril communication */
OMX_IndexParamImagePoolDisplayFunction, /**<reference : OMX_PARAM_IMAGEDISPLAYFUNCTIONTYPE */
OMX_IndexParamBrcmDataUnit, /**<reference: OMX_PARAM_DATAUNITTYPE */
OMX_IndexParamCodecConfig, /**<reference: OMX_PARAM_CODECCONFIGTYPE */
OMX_IndexParamCameraPoolToEncoderFunction, /**<reference : OMX_PARAM_CAMERAPOOLTOENCODERFUNCTIONTYPE */
OMX_IndexParamCameraStripeFunction, /**<reference : OMX_PARAM_CAMERASTRIPEFUNCTIONTYPE */
OMX_IndexParamCameraCaptureEventFunction, /**<reference : OMX_PARAM_CAMERACAPTUREEVENTFUNCTIONTYPE */
-
+
/* used for client-ril communication */
OMX_IndexParamTestInterface, /**< reference : OMX_PARAM_TESTINTERFACETYPE */
@@ -366,13 +366,13 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexConfigRequestCallback, /**< reference: OMX_CONFIG_REQUESTCALLBACKTYPE */ //Should be added to the spec as part of IL416c
OMX_IndexConfigBrcmOutputBufferFullCount, /**< reference: OMX_PARAM_U32TYPE */
OMX_IndexConfigCommonFocusRegionXY, /**< reference: OMX_CONFIG_FOCUSREGIONXYTYPE */
- OMX_IndexParamBrcmDisableEXIF, /**< reference: OMX_CONFIG_BOOLEANTYPE */
+ OMX_IndexParamBrcmDisableEXIF, /**< reference: OMX_CONFIG_BOOLEANTYPE */
OMX_IndexConfigUserSettingsId, /**< reference: OMX_CONFIG_U8TYPE */
OMX_IndexConfigCameraSettings, /**< reference: OMX_CONFIG_CAMERASETTINGSTYPE */
OMX_IndexConfigDrawBoxLineParams, /**< reference: OMX_CONFIG_DRAWBOXLINEPARAMS */
OMX_IndexParamCameraRmiControl, /**< reference: OMX_PARAM_CAMERARMITYPE */
OMX_IndexConfigBurstCapture, /**< reference: OMX_CONFIG_BOOLEANTYPE */
- OMX_IndexParamBrcmEnableIJGTableScaling, /**< reference: OMX_PARAM_IJGSCALINGTYPE */
+ OMX_IndexParamBrcmEnableIJGTableScaling, /**< reference: OMX_PARAM_IJGSCALINGTYPE */
OMX_IndexConfigPowerDown, /**< reference: OMX_CONFIG_BOOLEANTYPE */
OMX_IndexConfigBrcmSyncOutput, /**< reference: OMX_CONFIG_BRCMSYNCOUTPUTTYPE */
OMX_IndexParamBrcmFlushCallback, /**< reference: OMX_PARAM_BRCMFLUSHCALLBACK */
@@ -390,7 +390,7 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexConfigBrcmAudioSource, /**<reference: OMX_CONFIG_BRCMAUDIOSOURCETYPE */
OMX_IndexConfigBrcmAudioDestination, /**< reference: OMX_CONFIG_BRCMAUDIODESTINATIONTYPE */
OMX_IndexParamAudioDdp, /**< reference: OMX_AUDIO_PARAM_DDPTYPE */
- OMX_IndexParamBrcmThumbnail, /**< reference: OMX_PARAM_BRCMTHUMBNAILTYPE */
+ OMX_IndexParamBrcmThumbnail, /**< reference: OMX_PARAM_BRCMTHUMBNAILTYPE */
OMX_IndexParamBrcmDisableLegacyBlocks, /**< reference: OMX_CONFIG_BOOLEANTYPE */
OMX_IndexParamBrcmCameraInputAspectRatio, /**< reference: OMX_PARAM_BRCMASPECTRATIOTYPE */
OMX_IndexParamDynamicParameterFileFailFatal,/**< reference: OMX_CONFIG_BOOLEANTYPE */
@@ -417,7 +417,7 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexConfigCommonSceneDetectionControl,/**< reference: OMX_CONFIG_BOOLEANTYPE */
OMX_IndexConfigCommonSceneDetected, /**< reference: OMX_CONFIG_SCENEDETECTTYPE */
OMX_IndexParamDisableVllPool, /**< reference: OMX_CONFIG_BOOLEANTYPE */
- OMX_IndexParamVideoMvc, /**< reference: OMX_VIDEO_PARAM_MVCTYPE */
+ OMX_IndexParamVideoMvc, /**< reference: OMX_VIDEO_PARAM_MVCTYPE */
OMX_IndexConfigBrcmDrawStaticBox, /**< reference: OMX_CONFIG_STATICBOXTYPE */
OMX_IndexConfigBrcmClockReferenceSource, /**< reference: OMX_CONFIG_BOOLEANTYPE */
OMX_IndexParamPassBufferMarks, /**< reference: OMX_CONFIG_BOOLEANTYPE */
@@ -449,6 +449,19 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexParamBrcmEEDELossRate, /**< reference: OMX_VIDEO_EEDE_LOSSRATE */
OMX_IndexParamAudioDts, /**< reference: OMX_AUDIO_PARAM_DTSTYPE */
+ // 0x7f0000b0
+ OMX_IndexParamNumOutputChannels, /**< reference: OMX_PARAM_U32TYPE */
+ OMX_IndexConfigBrcmHighDynamicRange, /**< reference: OMX_CONFIG_BOOLEANTYPE */
+ OMX_IndexConfigBrcmPoolMemAllocSize, /**< reference: OMX_PARAM_U32TYPE */
+ OMX_IndexConfigBrcmBufferFlagFilter, /**< reference: OMX_PARAM_U32TYPE */
+ OMX_IndexParamBrcmVideoEncodeMinQuant, /**< reference: OMX_PARAM_U32TYPE */
+ OMX_IndexParamBrcmVideoEncodeMaxQuant, /**< reference: OMX_PARAM_U32TYPE */
+ OMX_IndexParamRateControlModel, /**< reference: OMX_PARAM_U32TYPE */
+ OMX_IndexParamBrcmExtraBuffers, /**< reference: OMX_PARAM_U32TYPE */
+
+ // 0x7f0000f0
+ OMX_IndexConfigBrcmAudioDownmixCoefficients = 0x7f0000f0, /**< reference: OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS */
+
OMX_IndexMax = 0x7FFFFFFF
} OMX_INDEXTYPE;
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit 2997db1

Please sign in to comment.