Skip to content

Commit

Permalink
Update MMAL translation
Browse files Browse the repository at this point in the history 
Plenty of changes since last time!
  • Loading branch information
@waveform80
waveform80 committed May 7, 2016
1 parent da2b24f commit 31a0b1a
Show file tree
Hide file tree
Showing 2 changed files with 278 additions and 79 deletions.
131 changes: 125 additions & 6 deletions picamera/mmal.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,12 @@ class MMAL_PARAMETER_LOGGING_T(ct.Structure):
MMAL_PARAMETER_STILLS_DENOISE,
MMAL_PARAMETER_ANNOTATE,
MMAL_PARAMETER_STEREOSCOPIC_MODE,
) = range(MMAL_PARAMETER_GROUP_CAMERA, MMAL_PARAMETER_GROUP_CAMERA + 75)
MMAL_PARAMETER_CAMERA_INTERFACE,
MMAL_PARAMETER_CAMERA_CLOCKING_MODE,
MMAL_PARAMETER_CAMERA_RX_CONFIG,
MMAL_PARAMETER_CAMERA_RX_TIMING,
MMAL_PARAMETER_DPF_CONFIG,
) = range(MMAL_PARAMETER_GROUP_CAMERA, MMAL_PARAMETER_GROUP_CAMERA + 80)

class MMAL_PARAMETER_THUMBNAIL_CONFIG_T(ct.Structure):
_fields_ = [
Expand Down Expand Up @@ -1192,6 +1197,112 @@ class MMAL_PARAMETER_STEREOSCOPIC_MODE_T(ct.Structure):
('swap_eyes', MMAL_BOOL_T),
]

MMAL_CAMERA_INTERFACE_T = ct.c_uint32 # enum
(
MMAL_CAMERA_INTERFACE_CSI2,
MMAL_CAMERA_INTERFACE_CCP2,
MMAL_CAMERA_INTERFACE_CPI,
) = range(3)
MMAL_CAMERA_INTERFACE_MAX = 0x7fffffff

class MMAL_PARAMETER_CAMERA_INTERFACE_T(ct.Structure):
_fields_ = [
('hdr', MMAL_PARAMETER_HEADER_T),
('mode', MMAL_CAMERA_INTERFACE_T),
]

MMAL_CAMERA_CLOCKING_MODE_T = ct.c_uint32 # enum
(
MMAL_CAMERA_CLOCKING_MODE_STROBE,
MMAL_CAMERA_CLOCKING_MODE_CLOCK,
) = range(2)
MMAL_CAMERA_CLOCKING_MODE_MAX = 0x7fffffff

class MMAL_PARAMETER_CAMERA_CLOCKING_MODE_T(ct.Structure):
_fields_ = [
('hdr', MMAL_PARAMETER_HEADER_T),
('mode', MMAL_CAMERA_CLOCKING_MODE_T),
]

MMAL_CAMERA_RX_CONFIG_DECODE = ct.c_uint32 # enum
(
MMAL_CAMERA_RX_CONFIG_DECODE_NONE,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM8TO10,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM7TO10,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM6TO10,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM8TO12,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM7TO12,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM6TO12,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM10TO14,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM8TO14,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM12TO16,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM10TO16,
MMAL_CAMERA_RX_CONFIG_DECODE_DPCM8TO16,
) = range(12)
MMAL_CAMERA_RX_CONFIG_DECODE_MAX = 0x7fffffff

MMAL_CAMERA_RX_CONFIG_ENCODE = ct.c_uint32 # enum
(
MMAL_CAMERA_RX_CONFIG_ENCODE_NONE,
MMAL_CAMERA_RX_CONFIG_ENCODE_DPCM10TO8,
MMAL_CAMERA_RX_CONFIG_ENCODE_DPCM12TO8,
MMAL_CAMERA_RX_CONFIG_ENCODE_DPCM14TO8,
) = range(4)
MMAL_CAMERA_RX_CONFIG_ENCODE_MAX = 0x7fffffff

MMAL_CAMERA_RX_CONFIG_UNPACK = ct.c_uint32 # enum
(
MMAL_CAMERA_RX_CONFIG_UNPACK_NONE,
MMAL_CAMERA_RX_CONFIG_UNPACK_6,
MMAL_CAMERA_RX_CONFIG_UNPACK_7,
MMAL_CAMERA_RX_CONFIG_UNPACK_8,
MMAL_CAMERA_RX_CONFIG_UNPACK_10,
MMAL_CAMERA_RX_CONFIG_UNPACK_12,
MMAL_CAMERA_RX_CONFIG_UNPACK_14,
MMAL_CAMERA_RX_CONFIG_UNPACK_16,
) = range(8)
MMAL_CAMERA_RX_CONFIG_UNPACK_MAX = 0x7fffffff

MMAL_CAMERA_RX_CONFIG_PACK = ct.c_uint32 # enum
(
MMAL_CAMERA_RX_CONFIG_PACK_NONE,
MMAL_CAMERA_RX_CONFIG_PACK_8,
MMAL_CAMERA_RX_CONFIG_PACK_10,
MMAL_CAMERA_RX_CONFIG_PACK_12,
MMAL_CAMERA_RX_CONFIG_PACK_14,
MMAL_CAMERA_RX_CONFIG_PACK_16,
MMAL_CAMERA_RX_CONFIG_PACK_RAW10,
MMAL_CAMERA_RX_CONFIG_PACK_RAW12,
) = range(8)
MMAL_CAMERA_RX_CONFIG_PACK_MAX = 0x7fffffff

class MMAL_PARAMETER_CAMERA_RX_CONFIG_T(ct.Structure):
_fields_ = [
('hdr', MMAL_PARAMETER_HEADER_T),
('decode', MMAL_CAMERA_RX_CONFIG_DECODE),
('encode', MMAL_CAMERA_RX_CONFIG_ENCODE),
('unpack', MMAL_CAMERA_RX_CONFIG_UNPACK),
('pack', MMAL_CAMERA_RX_CONFIG_PACK),
('data_lanes', ct.c_uint32),
('encode_block_length', ct.c_uint32),
('embedded_data_lines', ct.c_uint32),
('image_id', ct.c_uint32),
]

class MMAL_PARAMETER_CAMERA_RX_TIMING_T(ct.Structure):
_fields_ = [
('hdr', MMAL_PARAMETER_HEADER_T),
('timing1', ct.c_uint32),
('timing2', ct.c_uint32),
('timing3', ct.c_uint32),
('timing4', ct.c_uint32),
('timing5', ct.c_uint32),
('term1', ct.c_uint32),
('term2', ct.c_uint32),
('cpi_timing1', ct.c_uint32),
('cpi_timing2', ct.c_uint32),
]

# mmal_parameters_video.h ####################################################

(
Expand Down Expand Up @@ -1242,7 +1353,10 @@ class MMAL_PARAMETER_STEREOSCOPIC_MODE_T(ct.Structure):
MMAL_PARAMETER_VIDEO_ENCODE_INLINE_VECTORS,
MMAL_PARAMETER_VIDEO_RENDER_STATS,
MMAL_PARAMETER_VIDEO_INTERLACE_TYPE,
) = range(MMAL_PARAMETER_GROUP_VIDEO, MMAL_PARAMETER_GROUP_VIDEO + 47)
MMAL_PARAMETER_VIDEO_INTERPOLATE_TIMESTAMPS,
MMAL_PARAMETER_VIDEO_ENCODE_SPS_TIMINGS,
MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS,
) = range(MMAL_PARAMETER_GROUP_VIDEO, MMAL_PARAMETER_GROUP_VIDEO + 50)

MMAL_DISPLAYTRANSFORM_T = ct.c_uint32 # enum
MMAL_DISPLAY_ROT0 = 0
Expand Down Expand Up @@ -1644,8 +1758,6 @@ class MMAL_PARAMETER_BYTES_T(ct.Structure):
('data', ct.POINTER(ct.c_uint8)),
]

#define MMAL_FIXED_16_16_ONE (1 << 16)

class MMAL_PARAMETER_SCALEFACTOR_T(ct.Structure):
_fields_ = [
('hdr', MMAL_PARAMETER_HEADER_T),
Expand All @@ -1670,13 +1782,13 @@ class MMAL_PARAMETER_MIRROR_T(ct.Structure):
class MMAL_PARAMETER_URI_T(ct.Structure):
_fields_ = [
('hdr', MMAL_PARAMETER_HEADER_T),
('uri', ct.c_char_p),
('uri', ct.c_char * 200),
]

class MMAL_PARAMETER_ENCODING_T(ct.Structure):
_fields_ = [
('hdr', MMAL_PARAMETER_HEADER_T),
('encoding', ct.POINTER(ct.c_uint32)),
('encoding', ct.c_uint32 * 50),
]

class MMAL_PARAMETER_FRAME_RATE_T(ct.Structure):
Expand Down Expand Up @@ -2044,6 +2156,12 @@ class MMAL_EVENT_PARAMETER_CHANGED_T(ct.Structure):
MMAL_ENCODING_BGR24 = MMAL_FOURCC('BGR3')
MMAL_ENCODING_BGR32 = MMAL_FOURCC('BGR4')

MMAL_ENCODING_BAYER_SBGGR10P = MMAL_FOURCC('pBAA')
MMAL_ENCODING_BAYER_SBGGR8 = MMAL_FOURCC('BA81')
MMAL_ENCODING_BAYER_SBGGR12P = MMAL_FOURCC('BY12')
MMAL_ENCODING_BAYER_SBGGR16 = MMAL_FOURCC('BYR2')
MMAL_ENCODING_BAYER_SBGGR10DPCM8 = MMAL_FOURCC('bBA8')

MMAL_ENCODING_YUVUV128 = MMAL_FOURCC('SAND')
MMAL_ENCODING_OPAQUE = MMAL_FOURCC('OPQV')

Expand Down Expand Up @@ -2122,6 +2240,7 @@ class MMAL_EVENT_PARAMETER_CHANGED_T(ct.Structure):
MMAL_COMPONENT_DEFAULT_AUDIO_RENDERER = b"vc.ril.audio_render"
MMAL_COMPONENT_DEFAULT_MIRACAST = b"vc.miracast"
MMAL_COMPONENT_DEFAULT_CLOCK = b"vc.clock"
MMAL_COMPONENT_DEFAULT_CAMERA_INFO = b"vc.camera_info"
# The following two components aren't in the MMAL headers, but do exist
MMAL_COMPONENT_DEFAULT_NULL_SINK = b"vc.null_sink"
MMAL_COMPONENT_DEFAULT_RESIZER = b"vc.ril.resize"
Expand Down

0 comments on commit 31a0b1a

Please sign in to comment.