Skip to content

Commit 79ba6c8

Browse files
mgonchargfxVPLsdm
authored andcommitted
API: minor fixes
- removed trailing spaces - fixed some alignment of code - fixed some doxygen tags
1 parent 307c53d commit 79ba6c8

14 files changed

+252
-280
lines changed

api/vpl/mfxadapter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern "C"
2525
2626
@return
2727
MFX_ERR_NONE The function completed successfully. \n
28-
MFX_ERR_NULL_PTR
28+
MFX_ERR_NULL_PTR
2929
@p input_info or adapters pointer is NULL. \n
3030
MFX_ERR_NOT_FOUND No suitable adapters found. \n
3131
MFX_WRN_OUT_OF_RANGE Not enough memory to report back entire list of adapters. In this case as many adapters as possible will be returned.

api/vpl/mfxcamera.h

Lines changed: 53 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extern "C" {
2525
*/
2626
enum {
2727
/*!
28-
This extended buffer is mandatory for camera raw acclerator initialization. See the mfxExtCamPipeControl structure for details.
28+
This extended buffer is mandatory for camera raw accelerator initialization. See the mfxExtCamPipeControl structure for details.
2929
The application should attach this extended buffer to the mfxVideoParam structure to configure camera processing initialization.
3030
*/
3131
MFX_EXTBUF_CAM_PIPECONTROL = MFX_MAKEFOURCC('C', 'P', 'P', 'C'),
@@ -106,13 +106,11 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
106106
A hint structure that configures Camera White Balance filter.
107107
*/
108108
typedef struct {
109-
mfxExtBuffer
110-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_WHITE_BALANCE. */
111-
mfxU32
112-
Mode; /*!< Specifies one of White Balance operation modes defined in enumeration mfxCamWhiteBalanceMode. */
113-
mfxF64 R; /*!< White Balance Red correction. */
114-
mfxF64 G0; /*!< White Balance Green Top correction. */
115-
mfxF64 B; /*!< White Balance Blue correction.*/
109+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_WHITE_BALANCE. */
110+
mfxU32 Mode; /*!< Specifies one of White Balance operation modes defined in enumeration mfxCamWhiteBalanceMode. */
111+
mfxF64 R; /*!< White Balance Red correction.*/
112+
mfxF64 G0; /*!< White Balance Green Top correction.*/
113+
mfxF64 B; /*!< White Balance Blue correction.*/
116114
mfxF64 G1; /*!< White Balance Green Bottom correction. */
117115
mfxU32 reserved[8]; /*!< Reserved for future extension. */
118116
} mfxExtCamWhiteBalance;
@@ -123,8 +121,7 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
123121
A hint structure that configures Camera Total Color Control filter.
124122
*/
125123
typedef struct {
126-
mfxExtBuffer
127-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_TOTAL_COLOR_CONTROL. */
124+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_TOTAL_COLOR_CONTROL. */
128125
mfxU16 R; /*!< Red element.*/
129126
mfxU16 G; /*!< Green element.*/
130127
mfxU16 B; /*!< Blue element.*/
@@ -140,15 +137,11 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
140137
A hint structure that configures Camera YUV to RGB format conversion.
141138
*/
142139
typedef struct {
143-
mfxExtBuffer
144-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_CSC_YUV_RGB. */
145-
mfxF32 PreOffset
146-
[3]; /*!< Specifies offset for conversion from full range RGB input to limited range YUV for input color coordinate.*/
147-
mfxF32 Matrix[3]
148-
[3]; /*!< Specifies conversion matrix with CSC coefficients.*/
149-
mfxF32 PostOffset
150-
[3]; /*!< Specifies offset for conversion from full range RGB input to limited range YUV for output color coordinate.*/
151-
mfxU16 reserved[30]; /*!< Reserved for future extension.*/
140+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_CSC_YUV_RGB. */
141+
mfxF32 PreOffset[3]; /*!< Specifies offset for conversion from full range RGB input to limited range YUV for input color coordinate.*/
142+
mfxF32 Matrix[3][3]; /*!< Specifies conversion matrix with CSC coefficients.*/
143+
mfxF32 PostOffset[3]; /*!< Specifies offset for conversion from full range RGB input to limited range YUV for output color coordinate.*/
144+
mfxU16 reserved[30]; /*!< Reserved for future extension.*/
152145
} mfxExtCamCscYuvRgb;
153146
MFX_PACK_END()
154147

@@ -157,24 +150,22 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
157150
A hint structure that configures Camera Hot Pixel Removal filter.
158151
*/
159152
typedef struct {
160-
mfxExtBuffer
161-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_HOT_PIXEL_REMOVAL. */
153+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_HOT_PIXEL_REMOVAL. */
162154
mfxU16 PixelThresholdDifference; /*!< Threshold for Hot Pixel difference. */
163-
mfxU16 PixelCountThreshold; /*!< Count pixel detection.*/
164-
mfxU16 reserved[32]; /*!< Reserved for future extension.*/
155+
mfxU16 PixelCountThreshold; /*!< Count pixel detection.*/
156+
mfxU16 reserved[32]; /*!< Reserved for future extension.*/
165157
} mfxExtCamHotPixelRemoval;
166158
MFX_PACK_END()
167159

168160
MFX_PACK_BEGIN_USUAL_STRUCT()
169161
typedef struct {
170-
/*!
162+
/*!
171163
A hint structure that configures Camera black level correction.
172164
*/
173-
mfxExtBuffer
174-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_BLACK_LEVEL_CORRECTION. */
175-
mfxU16 R; /*!< Black Level Red correction.*/
165+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_BLACK_LEVEL_CORRECTION. */
166+
mfxU16 R; /*!< Black Level Red correction.*/
176167
mfxU16 G0; /*!< Black Level Green Top correction.*/
177-
mfxU16 B; /*!< Black Level Blue correction.*/
168+
mfxU16 B; /*!< Black Level Blue correction.*/
178169
mfxU16 G1; /*!< Black Level Green Bottom correction.*/
179170
mfxU32 reserved[4]; /*!< Reserved for future extension.*/
180171
} mfxExtCamBlackLevelCorrection;
@@ -185,8 +176,8 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
185176
A structure that defines Camera Vignette Correction Element.
186177
*/
187178
typedef struct {
188-
mfxU8 integer; /*!< Integer part of correction element.*/
189-
mfxU8 mantissa; /*!< Fractional part of correction element.*/
179+
mfxU8 integer; /*!< Integer part of correction element.*/
180+
mfxU8 mantissa; /*!< Fractional part of correction element.*/
190181
mfxU8 reserved[6]; /*!< Reserved for future extension.*/
191182
} mfxCamVignetteCorrectionElement;
192183
MFX_PACK_END()
@@ -196,9 +187,9 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
196187
A structure that defines Camera Vignette Correction Parameters.
197188
*/
198189
typedef struct {
199-
mfxCamVignetteCorrectionElement R; /*!< Red correction element.*/
190+
mfxCamVignetteCorrectionElement R; /*!< Red correction element.*/
200191
mfxCamVignetteCorrectionElement G0; /*!< Green top correction element.*/
201-
mfxCamVignetteCorrectionElement B; /*!< Blue Correction element.*/
192+
mfxCamVignetteCorrectionElement B; /*!< Blue Correction element.*/
202193
mfxCamVignetteCorrectionElement G1; /*!< Green bottom correction element.*/
203194
mfxU32 reserved[4]; /*!< Reserved for future extension.*/
204195
} mfxCamVignetteCorrectionParam;
@@ -209,20 +200,15 @@ MFX_PACK_BEGIN_STRUCT_W_PTR()
209200
A hint structure that configures Camera Vignette Correction filter.
210201
*/
211202
typedef struct {
212-
mfxExtBuffer
213-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_VIGNETTE_CORRECTION. */
214-
mfxU32
215-
Width; /*!< Width of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
216-
mfxU32
217-
Height; /*!< Height of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
218-
mfxU32
219-
Pitch; /*!< Pitch of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
220-
mfxU32 reserved[7]; /*!< Reserved for future extension.*/
203+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_VIGNETTE_CORRECTION. */
204+
mfxU32 Width; /*!< Width of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
205+
mfxU32 Height; /*!< Height of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
206+
mfxU32 Pitch; /*!< Pitch of Correction Map 2D buffer in mfxCamVignetteCorrectionParam elements. */
207+
mfxU32 reserved[7]; /*!< Reserved for future extension.*/
221208

222209
union {
223-
mfxCamVignetteCorrectionParam*
224-
CorrectionMap; /*!< 2D buffer of mfxCamVignetteCorrectionParam elements.*/
225-
mfxU64 reserved1; /*!< Reserved for alignment on 32bit and 64bit.*/
210+
mfxCamVignetteCorrectionParam* CorrectionMap; /*!< 2D buffer of mfxCamVignetteCorrectionParam elements.*/
211+
mfxU64 reserved1; /*!< Reserved for alignment on 32bit and 64bit.*/
226212
};
227213
} mfxExtCamVignetteCorrection;
228214
MFX_PACK_END()
@@ -232,9 +218,8 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
232218
A hint structure that configures Camera Bayer denoise filter.
233219
*/
234220
typedef struct {
235-
mfxExtBuffer
236-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_BAYER_DENOISE. */
237-
mfxU16 Threshold; /*!< Level of denoise, legal values: [0:63].*/
221+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_BAYER_DENOISE. */
222+
mfxU16 Threshold; /*!< Level of denoise, legal values: [0:63].*/
238223
mfxU16 reserved[27]; /*!< Reserved for future extension.*/
239224
} mfxExtCamBayerDenoise;
240225
MFX_PACK_END()
@@ -244,11 +229,8 @@ MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
244229
A hint structure that configures Camera Color correction filter.
245230
*/
246231
typedef struct {
247-
mfxExtBuffer
248-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_COLOR_CORRECTION_3X3. */
249-
mfxF32 CCM
250-
[3]
251-
[3]; /*!< 3x3 dimension matrix providing RGB Color Correction coefficients.*/
232+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_COLOR_CORRECTION_3X3. */
233+
mfxF32 CCM[3][3]; /*!< 3x3 dimension matrix providing RGB Color Correction coefficients.*/
252234
mfxU32 reserved[32]; /*!< Reserved for future extension.*/
253235
} mfxExtCamColorCorrection3x3;
254236
MFX_PACK_END()
@@ -258,17 +240,12 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
258240
A hint structure that configures Camera Padding.
259241
*/
260242
typedef struct {
261-
mfxExtBuffer
262-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_PADDING. */
263-
mfxU16
264-
Top; /*!< Specify number of padded columns respectively. Currently only 8 pixels supported for all dimensions. */
265-
mfxU16
266-
Bottom; /*!< Specify number of padded columns respectively. Currently only 8 pixels supported for all dimensions. */
267-
mfxU16
268-
Left; /*!< Specify number of padded rows respectively. Currently only 8 pixels supported for all dimensions. */
269-
mfxU16
270-
Right; /*!< Specify number of padded rows respectively. Currently only 8 pixels supported for all dimensions. */
271-
mfxU32 reserved[4]; /*!< Reserved for future extension.*/
243+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_PADDING. */
244+
mfxU16 Top; /*!< Specify number of padded columns respectively. Currently only 8 pixels supported for all dimensions. */
245+
mfxU16 Bottom; /*!< Specify number of padded columns respectively. Currently only 8 pixels supported for all dimensions. */
246+
mfxU16 Left; /*!< Specify number of padded rows respectively. Currently only 8 pixels supported for all dimensions. */
247+
mfxU16 Right; /*!< Specify number of padded rows respectively. Currently only 8 pixels supported for all dimensions. */
248+
mfxU32 reserved[4]; /*!< Reserved for future extension.*/
272249
} mfxExtCamPadding;
273250
MFX_PACK_END()
274251

@@ -303,12 +280,10 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
303280
A hint structure that configures camera pipe control.
304281
*/
305282
typedef struct {
306-
mfxExtBuffer
307-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_PIPECONTROL. */
308-
mfxU16
309-
RawFormat; /*!< Specifies one of the four Bayer patterns defined in mfxCamBayerFormat enumeration.*/
310-
mfxU16 reserved1; /*!< Reserved for future extension.*/
311-
mfxU32 reserved[5]; /*!< Reserved for future extension.*/
283+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_PIPECONTROL. */
284+
mfxU16 RawFormat; /*!< Specifies one of the four Bayer patterns defined in mfxCamBayerFormat enumeration. */
285+
mfxU16 reserved1; /*!< Reserved for future extension.*/
286+
mfxU32 reserved[5]; /*!< Reserved for future extension.*/
312287
} mfxExtCamPipeControl;
313288
MFX_PACK_END()
314289

@@ -318,9 +293,9 @@ MFX_PACK_BEGIN_USUAL_STRUCT()
318293
*/
319294
typedef struct {
320295
mfxU16 Pixel; /*!< Pixel value.*/
321-
mfxU16 Red; /*!< Corrected Red value.*/
296+
mfxU16 Red; /*!< Corrected Red value.*/
322297
mfxU16 Green; /*!< Corrected Green value.*/
323-
mfxU16 Blue; /*!< Corrected Blue value.*/
298+
mfxU16 Blue; /*!< Corrected Blue value.*/
324299
} mfxCamFwdGammaSegment;
325300
MFX_PACK_END()
326301

@@ -329,14 +304,13 @@ MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
329304
A hint structure that configures Camera Forward Gamma Correction filter.
330305
*/
331306
typedef struct {
332-
mfxExtBuffer
333-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_FORWARD_GAMMA_CORRECTION. */
307+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_FORWARD_GAMMA_CORRECTION. */
334308

335309
mfxU16 reserved[19]; /*!< Reserved for future extension.*/
336-
mfxU16 NumSegments; /*!< Number of Gamma segments.*/
310+
mfxU16 NumSegments; /*!< Number of Gamma segments.*/
337311
union {
338312
mfxCamFwdGammaSegment* Segment; /*!< Pointer to Gamma segments array.*/
339-
mfxU64 reserved1; /*!< Reserved for future extension.*/
313+
mfxU64 reserved1; /*!< Reserved for future extension.*/
340314
};
341315
} mfxExtCamFwdGamma;
342316
MFX_PACK_END()
@@ -363,7 +337,7 @@ MFX_PACK_END()
363337
enum {
364338
MFX_CAM_3DLUT17_SIZE = (17 * 17 * 17), /*!< 17^3 LUT size*/
365339
MFX_CAM_3DLUT33_SIZE = (33 * 33 * 33), /*!< 33^3 LUT size*/
366-
MFX_CAM_3DLUT65_SIZE = (65 * 65 * 65) /*!< 65^3 LUT size*/
340+
MFX_CAM_3DLUT65_SIZE = (65 * 65 * 65) /*!< 65^3 LUT size*/
367341
};
368342

369343
MFX_PACK_BEGIN_USUAL_STRUCT()
@@ -383,15 +357,12 @@ MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
383357
A hint structure that configures Camera 3DLUT filter.
384358
*/
385359
typedef struct {
386-
mfxExtBuffer
387-
Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_3DLUT. */
360+
mfxExtBuffer Header; /*!< Extension buffer header. Header.BufferId must be equal to MFX_EXTBUF_CAM_3DLUT. */
388361

389362
mfxU16 reserved[10]; /*!< Reserved for future extension.*/
390-
mfxU32
391-
Size; /*!< LUT size, defined in MFX_CAM_3DLUT17/33/65_SIZE enumeration.*/
363+
mfxU32 Size; /*!< LUT size, defined in MFX_CAM_3DLUT17/33/65_SIZE enumeration.*/
392364
union {
393-
mfxCam3DLutEntry*
394-
Table; /*!< Pointer to mfxCam3DLutEntry, size of each dimension depends on LUT size, e.g. LUT[17][17][17] for 17x17x17 look up table.*/
365+
mfxCam3DLutEntry* Table; /*!< Pointer to mfxCam3DLutEntry, size of each dimension depends on LUT size, e.g. LUT[17][17][17] for 17x17x17 look up table.*/
395366
mfxU64 reserved1; /*!< Reserved for future extension.*/
396367
};
397368
} mfxExtCam3DLut;

0 commit comments

Comments
 (0)