Permalink
Browse files

Move to newer version of GPU source tree (LKG56).

New vdec3 video decoder.
New hello_encode demo app.
loader.bin no longer required.
Note: need to update kernel, start.elf and opt/vc/lib together
  • Loading branch information...
popcornmix committed Oct 5, 2012
1 parent b87bc42 commit 1a7fbe8113ffadfde24863f6fcb50ff8be9265c6
Showing with 106,503 additions and 106,871 deletions.
  1. BIN boot/arm128_start.elf
  2. BIN boot/arm192_start.elf
  3. BIN boot/arm224_start.elf
  4. BIN boot/arm240_start.elf
  5. BIN boot/bootcode.bin
  6. BIN boot/kernel.img
  7. BIN boot/kernel_cutdown.img
  8. BIN boot/kernel_emergency.img
  9. BIN boot/loader.bin
  10. BIN boot/start.elf
  11. +8 −75 extra/Module.symvers
  12. +8 −75 extra/Module_cutdown.symvers
  13. +8 −75 extra/Module_emergency.symvers
  14. +35,746 −36,035 extra/System.map
  15. +30,674 −30,964 extra/System_cutdown.map
  16. +38,282 −38,572 extra/System_emergency.map
  17. +1 −1 extra/git_hash
  18. BIN hardfp/opt/vc/bin/edidparser
  19. BIN hardfp/opt/vc/bin/tvservice
  20. BIN hardfp/opt/vc/bin/vcdbg
  21. BIN hardfp/opt/vc/bin/vcgencmd
  22. BIN hardfp/opt/vc/bin/vchiq_test
  23. +146 −71 hardfp/opt/vc/include/IL/OMX_Broadcom.h
  24. +6 −0 hardfp/opt/vc/include/IL/OMX_IVCommon.h
  25. +24 −10 hardfp/opt/vc/include/IL/OMX_Index.h
  26. +7 −56 hardfp/opt/vc/include/IL/OMX_Video.h
  27. +8 −0 hardfp/opt/vc/include/interface/vchi/vchi.h
  28. +19 −26 hardfp/opt/vc/include/interface/vchi/vchi_autoservice.h
  29. +2 −15 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_bi.h
  30. +6 −0 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_bi_ipc_shared_mem.h
  31. +2 −15 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_bivcm.h
  32. +3 −3 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_cfg.h
  33. +23 −2 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_core.h
  34. +5 −6 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_if.h
  35. +3 −3 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_ioctl.h
  36. 0 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_memdrv.h
  37. 0 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_pagelist.h
  38. +3 −1 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_test.h
  39. +2 −1 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_util.h
  40. +8 −2 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_vc.h
  41. 0 hardfp/opt/vc/include/interface/vchiq_arm/vchiq_vc_dma.h
  42. 0 hardfp/opt/vc/include/interface/vcos/generic/vcos_generic_blockpool.h
  43. +7 −1 hardfp/opt/vc/include/interface/vcos/generic/vcos_joinable_thread_from_plain.h
  44. +47 −14 hardfp/opt/vc/include/interface/vcos/pthreads/vcos_platform.h
  45. +10 −16 hardfp/opt/vc/include/interface/vcos/pthreads/vcos_platform_types.h
  46. +30 −2 hardfp/opt/vc/include/interface/vcos/vcos_assert.h
  47. +8 −0 hardfp/opt/vc/include/interface/vcos/vcos_cmd.h
  48. +50 −3 hardfp/opt/vc/include/interface/vcos/vcos_init.h
  49. +8 −96 hardfp/opt/vc/include/interface/vcos/vcos_inttypes.h
  50. +25 −9 hardfp/opt/vc/include/interface/vcos/vcos_logging.h
  51. +4 −0 hardfp/opt/vc/include/interface/vcos/vcos_logging_control.h
  52. +3 −1 hardfp/opt/vc/include/interface/vcos/vcos_lowlevel_thread.h
  53. +6 −2 hardfp/opt/vc/include/interface/vcos/vcos_msgqueue.h
  54. +3 −1 hardfp/opt/vc/include/interface/vcos/vcos_semaphore.h
  55. +7 −4 hardfp/opt/vc/include/interface/vcos/vcos_stdbool.h
  56. +30 −135 hardfp/opt/vc/include/interface/vcos/vcos_stdint.h
  57. +35 −2 hardfp/opt/vc/include/interface/vcos/vcos_string.h
  58. +4 −1 hardfp/opt/vc/include/interface/vcos/vcos_thread.h
  59. +3 −1 hardfp/opt/vc/include/interface/vcos/vcos_timer.h
  60. +2 −1 hardfp/opt/vc/include/interface/vcos/vcos_types.h
  61. +10 −1 hardfp/opt/vc/include/interface/vctypes/vc_display_types.h
  62. 0 hardfp/opt/vc/include/interface/vmcs_host/vc_dispmanx.h
  63. +7 −0 hardfp/opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h
  64. +1 −0 hardfp/opt/vc/include/interface/vmcs_host/vc_fileservice_defs.h
  65. +2 −0 hardfp/opt/vc/include/interface/vmcs_host/vc_ilcs_defs.h
  66. +1 −1 hardfp/opt/vc/include/interface/vmcs_host/vc_tvservice.h
  67. +2 −0 hardfp/opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h
  68. BIN hardfp/opt/vc/lib/libEGL.so
  69. BIN hardfp/opt/vc/lib/libEGL_static.a
  70. BIN hardfp/opt/vc/lib/libGLESv1_CM.so
  71. BIN hardfp/opt/vc/lib/libGLESv1_CM.so
  72. BIN hardfp/opt/vc/lib/libGLESv2.so
  73. BIN hardfp/opt/vc/lib/libGLESv2_static.a
  74. BIN hardfp/opt/vc/lib/libOpenVG.so
  75. BIN hardfp/opt/vc/lib/libWFC.so
  76. BIN hardfp/opt/vc/lib/libbcm_host.so
  77. BIN hardfp/opt/vc/lib/libdebug_sym.so
  78. BIN hardfp/opt/vc/lib/libkhrn_client.a
  79. BIN hardfp/opt/vc/lib/libkhrn_static.a
  80. BIN hardfp/opt/vc/lib/libmmal.so
  81. BIN hardfp/opt/vc/lib/libopenmaxil.so
  82. BIN hardfp/opt/vc/lib/libvcfiled_check.a
  83. BIN hardfp/opt/vc/lib/libvchiq_arm.so
  84. BIN hardfp/opt/vc/lib/libvchostif.a
  85. BIN hardfp/opt/vc/lib/libvcos.so
  86. BIN hardfp/opt/vc/lib/libvmcs_rpc_client.a
  87. BIN hardfp/opt/vc/sbin/vcfiled
  88. 0 hardfp/opt/vc/src/hello_pi/Makefile.include
  89. 0 hardfp/opt/vc/src/hello_pi/README
  90. 0 hardfp/opt/vc/src/hello_pi/hello_audio/Makefile
  91. 0 hardfp/opt/vc/src/hello_pi/hello_audio/audio.c
  92. 0 hardfp/opt/vc/src/hello_pi/hello_audio/audioplay.h
  93. 0 hardfp/opt/vc/src/hello_pi/hello_dispmanx/Makefile
  94. 0 hardfp/opt/vc/src/hello_pi/hello_dispmanx/dispmanx.c
  95. +6 −0 hardfp/opt/vc/src/hello_pi/hello_encode/Makefile
  96. +284 −0 hardfp/opt/vc/src/hello_pi/hello_encode/encode.c
  97. 0 hardfp/opt/vc/src/hello_pi/hello_font/Makefile
  98. +3 −0 hardfp/opt/vc/src/hello_pi/hello_font/main.c
  99. 0 hardfp/opt/vc/src/hello_pi/hello_tiger/Makefile
  100. 0 hardfp/opt/vc/src/hello_pi/hello_triangle/Djenne_128_128.raw
  101. BIN hardfp/opt/vc/src/hello_pi/hello_triangle/Gaudi_128_128.raw
  102. BIN hardfp/opt/vc/src/hello_pi/hello_triangle/Lucca_128_128.raw
  103. 0 hardfp/opt/vc/src/hello_pi/hello_triangle/Makefile
  104. 0 hardfp/opt/vc/src/hello_pi/hello_triangle/cube_texture_and_coords.h
  105. 0 hardfp/opt/vc/src/hello_pi/hello_triangle/triangle.c
  106. 0 hardfp/opt/vc/src/hello_pi/hello_triangle2/Makefile
  107. 0 hardfp/opt/vc/src/hello_pi/hello_triangle2/triangle2.c
  108. 0 hardfp/opt/vc/src/hello_pi/hello_video/Makefile
  109. 0 hardfp/opt/vc/src/hello_pi/hello_video/README
  110. BIN hardfp/opt/vc/src/hello_pi/hello_video/test.h264
  111. 0 hardfp/opt/vc/src/hello_pi/hello_video/video.c
  112. 0 hardfp/opt/vc/src/hello_pi/hello_world/Makefile
  113. 0 hardfp/opt/vc/src/hello_pi/hello_world/world.c
  114. 0 hardfp/opt/vc/src/hello_pi/libs/ilclient/Makefile
  115. 0 hardfp/opt/vc/src/hello_pi/libs/vgfont/Makefile
  116. +2 −2 hardfp/opt/vc/src/hello_pi/libs/vgfont/font.c
  117. +4 −4 hardfp/opt/vc/src/hello_pi/libs/vgfont/graphics.c
  118. +2 −2 hardfp/opt/vc/src/hello_pi/libs/vgfont/graphics_x_private.h
  119. +2 −2 hardfp/opt/vc/src/hello_pi/libs/vgfont/vgfont.h
  120. +11 −25 hardfp/opt/vc/src/hello_pi/libs/vgfont/vgft.c
  121. +2 −0 hardfp/opt/vc/src/hello_pi/rebuild.sh
  122. BIN modules/3.2.27+/kernel/drivers/i2c/busses/i2c-bcm2708.ko
  123. BIN modules/3.2.27+/kernel/sound/arm/snd-bcm2835.ko
  124. BIN modules/3.2.27-cutdown+/kernel/sound/arm/snd-bcm2835.ko
  125. BIN opt/vc/bin/edidparser
  126. BIN opt/vc/bin/tvservice
  127. BIN opt/vc/bin/vcdbg
  128. BIN opt/vc/bin/vcgencmd
  129. BIN opt/vc/bin/vchiq_test
  130. +146 −71 opt/vc/include/IL/OMX_Broadcom.h
  131. +6 −0 opt/vc/include/IL/OMX_IVCommon.h
  132. +24 −10 opt/vc/include/IL/OMX_Index.h
  133. +7 −56 opt/vc/include/IL/OMX_Video.h
  134. +8 −0 opt/vc/include/interface/vchi/vchi.h
  135. +19 −26 opt/vc/include/interface/vchi/vchi_autoservice.h
  136. +2 −15 opt/vc/include/interface/vchiq_arm/vchiq_bi.h
  137. +6 −0 opt/vc/include/interface/vchiq_arm/vchiq_bi_ipc_shared_mem.h
  138. +2 −15 opt/vc/include/interface/vchiq_arm/vchiq_bivcm.h
  139. +3 −3 opt/vc/include/interface/vchiq_arm/vchiq_cfg.h
  140. +23 −2 opt/vc/include/interface/vchiq_arm/vchiq_core.h
  141. +5 −6 opt/vc/include/interface/vchiq_arm/vchiq_if.h
  142. +3 −3 opt/vc/include/interface/vchiq_arm/vchiq_ioctl.h
  143. 0 opt/vc/include/interface/vchiq_arm/vchiq_memdrv.h
  144. 0 opt/vc/include/interface/vchiq_arm/vchiq_pagelist.h
  145. +3 −1 opt/vc/include/interface/vchiq_arm/vchiq_test.h
  146. +2 −1 opt/vc/include/interface/vchiq_arm/vchiq_util.h
  147. +8 −2 opt/vc/include/interface/vchiq_arm/vchiq_vc.h
  148. 0 opt/vc/include/interface/vchiq_arm/vchiq_vc_dma.h
  149. 0 opt/vc/include/interface/vcos/generic/vcos_generic_blockpool.h
  150. +7 −1 opt/vc/include/interface/vcos/generic/vcos_joinable_thread_from_plain.h
  151. +47 −14 opt/vc/include/interface/vcos/pthreads/vcos_platform.h
  152. +10 −16 opt/vc/include/interface/vcos/pthreads/vcos_platform_types.h
  153. +30 −2 opt/vc/include/interface/vcos/vcos_assert.h
  154. +8 −0 opt/vc/include/interface/vcos/vcos_cmd.h
  155. +50 −3 opt/vc/include/interface/vcos/vcos_init.h
  156. +8 −96 opt/vc/include/interface/vcos/vcos_inttypes.h
  157. +25 −9 opt/vc/include/interface/vcos/vcos_logging.h
  158. +4 −0 opt/vc/include/interface/vcos/vcos_logging_control.h
  159. +3 −1 opt/vc/include/interface/vcos/vcos_lowlevel_thread.h
  160. +6 −2 opt/vc/include/interface/vcos/vcos_msgqueue.h
  161. +3 −1 opt/vc/include/interface/vcos/vcos_semaphore.h
  162. +7 −4 opt/vc/include/interface/vcos/vcos_stdbool.h
  163. +30 −135 opt/vc/include/interface/vcos/vcos_stdint.h
  164. +35 −2 opt/vc/include/interface/vcos/vcos_string.h
  165. +4 −1 opt/vc/include/interface/vcos/vcos_thread.h
  166. +3 −1 opt/vc/include/interface/vcos/vcos_timer.h
  167. +2 −1 opt/vc/include/interface/vcos/vcos_types.h
  168. +10 −1 opt/vc/include/interface/vctypes/vc_display_types.h
  169. 0 opt/vc/include/interface/vmcs_host/vc_dispmanx.h
  170. +7 −0 opt/vc/include/interface/vmcs_host/vc_dispmanx_types.h
  171. +1 −0 opt/vc/include/interface/vmcs_host/vc_fileservice_defs.h
  172. +2 −0 opt/vc/include/interface/vmcs_host/vc_ilcs_defs.h
  173. +1 −1 opt/vc/include/interface/vmcs_host/vc_tvservice.h
  174. +2 −0 opt/vc/include/interface/vmcs_host/vc_tvservice_defs.h
  175. BIN opt/vc/lib/libEGL.so
  176. BIN opt/vc/lib/libEGL_static.a
  177. BIN opt/vc/lib/libGLESv1_CM.so
  178. BIN opt/vc/lib/libGLESv1_CM.so
  179. BIN opt/vc/lib/libGLESv2.so
  180. BIN opt/vc/lib/libGLESv2_static.a
  181. BIN opt/vc/lib/libOpenVG.so
  182. BIN opt/vc/lib/libWFC.so
  183. BIN opt/vc/lib/libbcm_host.so
  184. BIN opt/vc/lib/libdebug_sym.so
  185. BIN opt/vc/lib/libkhrn_client.a
  186. BIN opt/vc/lib/libkhrn_static.a
  187. BIN opt/vc/lib/libmmal.so
  188. BIN opt/vc/lib/libopenmaxil.so
  189. BIN opt/vc/lib/libvcfiled_check.a
  190. BIN opt/vc/lib/libvchiq_arm.so
  191. BIN opt/vc/lib/libvchostif.a
  192. BIN opt/vc/lib/libvcos.so
  193. BIN opt/vc/lib/libvmcs_rpc_client.a
  194. BIN opt/vc/sbin/vcfiled
  195. 0 opt/vc/src/hello_pi/Makefile.include
  196. 0 opt/vc/src/hello_pi/README
  197. 0 opt/vc/src/hello_pi/hello_audio/Makefile
  198. 0 opt/vc/src/hello_pi/hello_audio/audio.c
  199. 0 opt/vc/src/hello_pi/hello_audio/audioplay.h
  200. 0 opt/vc/src/hello_pi/hello_dispmanx/Makefile
  201. 0 opt/vc/src/hello_pi/hello_dispmanx/dispmanx.c
  202. +6 −0 opt/vc/src/hello_pi/hello_encode/Makefile
  203. +284 −0 opt/vc/src/hello_pi/hello_encode/encode.c
  204. 0 opt/vc/src/hello_pi/hello_font/Makefile
  205. +3 −0 opt/vc/src/hello_pi/hello_font/main.c
  206. 0 opt/vc/src/hello_pi/hello_tiger/Makefile
  207. 0 opt/vc/src/hello_pi/hello_triangle/Djenne_128_128.raw
  208. BIN opt/vc/src/hello_pi/hello_triangle/Gaudi_128_128.raw
  209. BIN opt/vc/src/hello_pi/hello_triangle/Lucca_128_128.raw
  210. 0 opt/vc/src/hello_pi/hello_triangle/Makefile
  211. 0 opt/vc/src/hello_pi/hello_triangle/cube_texture_and_coords.h
  212. 0 opt/vc/src/hello_pi/hello_triangle/triangle.c
  213. 0 opt/vc/src/hello_pi/hello_triangle2/Makefile
  214. 0 opt/vc/src/hello_pi/hello_triangle2/triangle2.c
  215. 0 opt/vc/src/hello_pi/hello_video/Makefile
  216. 0 opt/vc/src/hello_pi/hello_video/README
  217. BIN opt/vc/src/hello_pi/hello_video/test.h264
  218. 0 opt/vc/src/hello_pi/hello_video/video.c
  219. 0 opt/vc/src/hello_pi/hello_world/Makefile
  220. 0 opt/vc/src/hello_pi/hello_world/world.c
  221. 0 opt/vc/src/hello_pi/libs/ilclient/Makefile
  222. 0 opt/vc/src/hello_pi/libs/vgfont/Makefile
  223. +2 −2 opt/vc/src/hello_pi/libs/vgfont/font.c
  224. +4 −4 opt/vc/src/hello_pi/libs/vgfont/graphics.c
  225. +2 −2 opt/vc/src/hello_pi/libs/vgfont/graphics_x_private.h
  226. +2 −2 opt/vc/src/hello_pi/libs/vgfont/vgfont.h
  227. +11 −25 opt/vc/src/hello_pi/libs/vgfont/vgft.c
  228. +2 −0 opt/vc/src/hello_pi/rebuild.sh
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.
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.
View

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1 +1 @@
-9245b4c35b99b3870e1f7dc598c5692b3c66a6f0
+22cb6e26206c3e0e7bfb8e2adf86e9b10f9187a6
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
@@ -191,7 +191,11 @@ rendering. The latency is returned as the number of samples that
an audio rendering component has received but have not been played.
*/
-
+/* OMX_IndexConfigBrcmPoolMemAllocSize: Pool memory usage values */
+/*
+This config allows the client to query how much memory is being used by
+the component for any image pools.
+*/
/* OMX_IndexConfigDisplayRegion: Display Region */
typedef enum OMX_DISPLAYTRANSFORMTYPE{
@@ -533,11 +537,11 @@ typedef struct OMX_PARAM_STILLSFUNCTIONTYPE {
OMX_U32 nSize;
OMX_VERSIONTYPE nVersion;
OMX_BOOL bBuffer;
- OMX_PTR (*pOpenFunc)();
- OMX_PTR (*pCloseFunc)();
- OMX_PTR (*pReadFunc)();
- OMX_PTR (*pSeekFunc)();
- OMX_PTR (*pWriteFunc)();
+ OMX_PTR (*pOpenFunc)(void);
+ OMX_PTR (*pCloseFunc)(void);
+ OMX_PTR (*pReadFunc)(void);
+ OMX_PTR (*pSeekFunc)(void);
+ OMX_PTR (*pWriteFunc)(void);
} OMX_PARAM_STILLSFUNCTIONTYPE;
typedef void* OMX_BUFFERADDRESSHANDLETYPE;
@@ -574,7 +578,7 @@ typedef struct OMX_CONFIG_IMAGEFILTERPARAMSTYPE {
OMX_U32 nPortIndex;
OMX_IMAGEFILTERTYPE eImageFilter;
OMX_U32 nNumParams;
- OMX_U32 nParams[4];
+ OMX_U32 nParams[5];
} OMX_CONFIG_IMAGEFILTERPARAMSTYPE;
/*
This structure contains optional parameters for some image
@@ -716,6 +720,8 @@ typedef struct OMX_PARAM_CAMERAIMAGEPOOLTYPE {
OMX_U32 nLoResWidth;
OMX_U32 nLoResHeight;
OMX_COLOR_FORMATTYPE eLoResType;
+ OMX_U32 nNumSnapshotFrames;
+ OMX_COLOR_FORMATTYPE eSnapshotType;
OMX_CAMERAIMAGEPOOLINPUTMODETYPE eInputPoolMode;
OMX_U32 nNumInputVideoFrames;
OMX_U32 nInputVideoWidth;
@@ -1220,7 +1226,7 @@ on.
*/
-/* OMX_IndexConfigCameraFlashType: Select flash type */
+/* OMX_IndexParamCameraFlashType: Select flash type */
typedef enum OMX_CAMERAFLASHTYPE {
OMX_CameraFlashDefault,
OMX_CameraFlashXenon,
@@ -1231,13 +1237,13 @@ typedef enum OMX_CAMERAFLASHTYPE {
OMX_CameraFlashMax = 0x7FFFFFFF
} OMX_CAMERAFLASHTYPE;
-typedef struct OMX_CONFIG_CAMERAFLASHTYPE {
+typedef struct OMX_PARAM_CAMERAFLASHTYPE {
OMX_U32 nSize;
OMX_VERSIONTYPE nVersion;
OMX_U32 nPortIndex;
OMX_CAMERAFLASHTYPE eFlashType;
OMX_BOOL bRedEyeUsesTorchMode;
-} OMX_CONFIG_CAMERAFLASHTYPE;
+} OMX_PARAM_CAMERAFLASHTYPE;
/*
This parameter allows the selection of xenon or LED flash devices
to be used with the currently selected camera. If that device is not
@@ -1283,52 +1289,6 @@ the duration of the exposure.
\code{eIgnoreChargeState} will make the flash fire, even if it is not fully charged.
*/
-/* OMX_IndexConfigCameraAlgorithmVersion: ISP Tuner algorithm version query */
-typedef enum OMX_CONFIG_CAMERAALGORITHMTYPE {
- OMX_CameraAlgorithmKhronosExtensions = 0x6F000000,
- OMX_CameraAlgorithmVendorStartUnused = 0x7F000000,
- OMX_CameraAlgorithmAGC,
- OMX_CameraAlgorithmAWB,
- OMX_CameraAlgorithmBlackLevel,
- OMX_CameraAlgorithmChromColour,
- OMX_CameraAlgorithmFocus,
- OMX_CameraAlgorithmLensShading,
- OMX_CameraAlgorithmCorrection,
- OMX_CameraAlgorithmSwDenoise,
- OMX_CameraAlgorithmMotionDetection,
- OMX_CameraAlgorithmDistortion,
- OMX_CameraAlgorithmDefectivePixelCorrection,
- OMX_CameraAlgorithmFaceTracking,
- OMX_CameraAlgorithmRedEyeReduction,
- OMX_CameraAlgorithmAntishake,
- OMX_CameraAlgorithmWriteBayerCaptureImages,
- OMX_CameraAlgorithmVideoDenoise,
- OMX_CameraAlgorithmStillsDenoise,
- OMX_CameraAlgorithmStabilisation,
- OMX_CameraAlgorithmImageEffects,
- OMX_CameraAlgorithmDarkFrameSubtraction,
- OMX_CameraAlgorithmRMI,
- OMX_CameraAlgorithmDynamicRangeExpansion,
- OMX_CameraAlgorithmFaceRecognition,
- OMX_CameraAlgorithmHighDynamicRange,
- OMX_CameraAlgorithmMax = 0x7FFFFFFF
-} OMX_CONFIG_CAMERAALGORITHMTYPE;
-
-typedef struct OMX_CONFIG_CAMERAALGORITHMVERSIONTYPE {
- OMX_U32 nSize;
- OMX_VERSIONTYPE nVersion;
- OMX_CONFIG_CAMERAALGORITHMTYPE eAlgorithm;
- OMX_U8 sAlgorithmName[32];
- OMX_U8 sVendorName[32];
- OMX_U32 nVersionMajor;
- OMX_U32 nVersionMinor;
- OMX_U32 nBuild;
-} OMX_CONFIG_CAMERAALGORITHMVERSIONTYPE;
-/*
-This config allows the client to query over the version of the ISP
-algorithm being used.
-*/
-
/* OMX_IndexConfigBrcmAudioTrackGaplessPlayback: Encoder/decoder delay and padding information for gapless playback. */
typedef struct OMX_CONFIG_BRCMAUDIOTRACKGAPLESSPLAYBACKTYPE {
OMX_U32 nSize;
@@ -1393,8 +1353,6 @@ typedef enum OMX_CAMERADISABLEALGORITHMTYPE {
OMX_CameraDisableAlgorithmAntiShake,
OMX_CameraDisableAlgorithmImageEffects,
OMX_CameraDisableAlgorithmDarkSubtract,
- OMX_CameraDisableAlgorithmDepurple,
- OMX_CameraDisableAlgorithmRmi,
OMX_CameraDisableAlgorithmDynamicRangeExpansion,
OMX_CameraDisableAlgorithmFaceRecognition,
OMX_CameraDisableAlgorithmFaceBeautification,
@@ -1531,15 +1489,6 @@ typedef struct OMX_PARAM_BRCMOUTPUTBUFFERSIZETYPE {
OMX_U32 nBufferSize;
} OMX_PARAM_BRCMOUTPUTBUFFERSIZETYPE;
-/** Can the camera focus, or is it busy capturing a frame? */
-typedef struct OMX_CONFIG_CANFOCUSTYPE
-{
- OMX_U32 nSize;
- OMX_VERSIONTYPE nVersion;
- OMX_U32 nPortIndex;
- OMX_BOOL bFocusAllowed;
-} OMX_CONFIG_CANFOCUSTYPE;
-
/* OMX_IndexConfigCameraInfo: Camera device driver information */
#define OMX_CONFIG_CAMERAINFOTYPE_NAME_LEN 16
typedef struct OMX_CONFIG_LENSCALIBRATIONVALUETYPE
@@ -1848,10 +1797,6 @@ at in its processing.
*/
/* OMX_IndexConfigDynamicRangeExpansion: Configure image dynamic range expansion processing */
-/*
-Configures the intensity of an image dynamic range expansion processing stage
-*/
-/* OMX_IndexConfigCameraFlashType: Select flash type */
typedef enum OMX_DYNAMICRANGEEXPANSIONMODETYPE {
OMX_DynRangeExpOff,
OMX_DynRangeExpLow,
@@ -1868,6 +1813,9 @@ typedef struct OMX_CONFIG_DYNAMICRANGEEXPANSIONTYPE
OMX_VERSIONTYPE nVersion;
OMX_DYNAMICRANGEEXPANSIONMODETYPE eMode;
} OMX_CONFIG_DYNAMICRANGEEXPANSIONTYPE;
+/*
+Configures the intensity of an image dynamic range expansion processing stage
+*/
/* OMX_IndexParamBrcmTransposeBufferCount: Configure the number of pre-allocated transpose buffers */
/*
@@ -2138,5 +2086,132 @@ typedef struct OMX_PARAM_TIMESTAMPMODETYPE
Specifies what to use as timestamps in the abscence of a clock component.
*/
+/* EGL image buffer for passing to video port.
+ * Used when port color format is OMX_COLOR_FormatBRCMEGL.
+ */
+typedef struct OMX_BRCMVEGLIMAGETYPE
+{
+ /* Passed between ARM + VC; use fixed width types. */
+ OMX_U32 nWidth;
+ OMX_U32 nHeight;
+ OMX_U32 nStride;
+ OMX_U32 nUmemHandle;
+ OMX_U32 nUmemOffset;
+ OMX_U32 nFlipped; /* Non-zero -> vertically flipped image */
+} OMX_BRCMVEGLIMAGETYPE;
+
+/* Provides field of view
+ */
+typedef struct OMX_CONFIG_BRCMFOVTYPE
+{
+ OMX_U32 nSize;
+ OMX_VERSIONTYPE nVersion;
+ OMX_U32 nPortIndex;
+ OMX_U32 xFieldOfViewHorizontal; /**< Horizontal field of view in degrees. 16p16 value */
+ OMX_U32 xFieldOfViewVertical; /**< Vertical field of view in degrees. 16p16 value */
+} OMX_CONFIG_BRCMFOVTYPE;
+
+/* OMX_IndexConfigBrcmDecoderPassThrough: Enabling Audio Passthrough */
+/*
+This allows an audio decoder to disable decoding the stream and pass through correctly framed
+data to enable playback of compressed audio to supported output devices.
+*/
+
+/* OMX_IndexConfigBrcmClockReferenceSource: Select Clock Reference Source */
+/*
+This control allows communicating directly to an audio renderer component whether it should
+act as a clock reference source or act as a slave.
+*/
+
+/* OMX_IndexConfigEncLevelExtension: AVC Override encode capabilities */
+typedef struct OMX_VIDEO_CONFIG_LEVEL_EXTEND {
+ OMX_U32 nSize;
+ OMX_VERSIONTYPE nVersion;
+ OMX_U32 nPortIndex;
+ OMX_U32 nCustomMaxMBPS; /**< Specifies maximum macro-blocks per second */
+ OMX_U32 nCustomMaxFS; /**< Specifies maximum frame size (macro-blocks per frame) */
+ OMX_U32 nCustomMaxBRandCPB; /**< Specifies maximum bitrate in units of 1000 bits/s and Codec Picture Buffer (CPB derived from bitrate) */
+} OMX_VIDEO_CONFIG_LEVEL_EXTEND;
+/*
+This allows finer control of the H264 encode internal parameters.
+*/
+
+/* OMX_IndexParamBrcmEEDEEnable: Enable/Disable end to end distortion estimator */
+typedef struct OMX_VIDEO_EEDE_ENABLE {
+ OMX_U32 nSize;
+ OMX_VERSIONTYPE nVersion;
+ OMX_U32 nPortIndex;
+ OMX_U32 enable;
+} OMX_VIDEO_EEDE_ENABLE;
+/*
+This enables or disables the use of end to end distortion estimation.
+*/
+
+/* OMX_IndexParamBrcmEEDELossRate: Loss rate configuration for end to end distortion */
+typedef struct OMX_VIDEO_EEDE_LOSSRATE {
+ OMX_U32 nSize;
+ OMX_VERSIONTYPE nVersion;
+ OMX_U32 nPortIndex;
+ OMX_U32 loss_rate; /**< loss rate, 5 means 5% */
+} OMX_VIDEO_EEDE_LOSSRATE;
+/*
+Set the packet loss rate used by the end to end distortion estimator.
+*/
+
+/* OMX_IndexParamColorSpace: Colour space information */
+typedef enum OMX_COLORSPACETYPE
+{
+ OMX_COLORSPACE_UNKNOWN,
+ OMX_COLORSPACE_JPEG_JFIF,
+ OMX_COLORSPACE_ITU_R_BT601,
+ OMX_COLORSPACE_ITU_R_BT709,
+ OMX_COLORSPACE_MAX = 0x7FFFFFFF
+} OMX_COLORSPACETYPE;
+
+typedef struct OMX_PARAM_COLORSPACETYPE
+{
+ OMX_U32 nSize;
+ OMX_VERSIONTYPE nVersion;
+ OMX_COLORSPACETYPE eColorSpace;
+} OMX_PARAM_COLORSPACETYPE;
+/*
+Provides information on the colour space that's in use during image/video processing.
+*/
+
+/* OMX_IndexConfigMinimiseFragmentation: Minimising Fragmentation */
+/*
+This control can be supported to enable the client to request that the component works
+to minimise fragmentation of output buffers.
+*/
+
+/* OMX_IndexConfigBrcmBufferFlagFilter: Filters buffers based on flags */
+/*
+This control can be set to request that buffers are conditionally forwarded on
+output ports based on matching flags set on that buffer.
+*/
+
+/* OMX_IndexParamPortMaxFrameSize: Specifying maximum frame size */
+/*
+This control can be used to control the maximum frame size allowed on an output port.
+*/
+
+/* OMX_IndexConfigBrcmCameraRnDPreprocess: Enable use of development ISP software stage */
+/*
+This control can be used to enable a developmental software stage to be inserted into
+the preprocessor stage of the ISP.
+*/
+
+/* OMX_IndexConfigBrcmCameraRnDPostprocess: Enable use of development ISP software stage */
+/*
+This control can be used to enable a developmental software stage to be inserted into
+the postprocessor stage of the ISP.
+*/
+
+/* OMX_IndexParamDisableVllPool: Controlling use of memory for loadable modules */
+/*
+This control can be used to control whether loadable modules used a dedicated memory
+pool or use heap allocated memory.
+*/
+
#endif
/* File EOF */
@@ -201,6 +201,10 @@ typedef enum OMX_IMAGEFILTERTYPE {
OMX_ImageFilterDeInterlaceAdvanced,
OMX_ImageFilterColourSwap,
+ OMX_ImageFilterWashedOut,
+ OMX_ImageFilterColourPoint,
+ OMX_ImageFilterPosterise,
+ OMX_ImageFilterColourBalance,
OMX_ImageFilterMax = 0x7FFFFFFF
} OMX_IMAGEFILTERTYPE;
@@ -520,6 +524,8 @@ typedef enum OMX_EXPOSURECONTROLTYPE {
OMX_ExposureControlVeryLong,
OMX_ExposureControlFixedFps,
OMX_ExposureControlNightWithPreview,
+ OMX_ExposureControlAntishake,
+ OMX_ExposureControlFireworks,
OMX_ExposureControlMax = 0x7FFFFFFF
} OMX_EXPOSURECONTROLTYPE;
Oops, something went wrong.

0 comments on commit 1a7fbe8

Please sign in to comment.