The open source OpenXR runtime
xrt: Rename XRT_FORMAT_YUV422 to XRT_FORMAT_YUYV422
authored by
Jakob Bornecrantz
and committed by
Jakob Bornecrantz
59b77941
a8941859
+26
-26
+1
-1
src/xrt/auxiliary/tracking/t_calibration.cpp
+1
-1
src/xrt/auxiliary/tracking/t_calibration.cpp
···
1183
1183
// Fill both c.gui.rgb and c.gray with the data we got.
1184
1184
switch (xf->format) {
1185
1185
case XRT_FORMAT_YUV888: process_frame_yuv(c, xf); break;
1186
-
case XRT_FORMAT_YUV422: process_frame_yuyv(c, xf); break;
1186
+
case XRT_FORMAT_YUYV422: process_frame_yuyv(c, xf); break;
1187
1187
case XRT_FORMAT_L8: process_frame_l8(c, xf); break;
1188
1188
default:
1189
1189
P("ERROR: Bad format '%s'", u_format_str(xf->format));
+1
-1
src/xrt/auxiliary/tracking/t_debug_hsv_picker.cpp
+1
-1
src/xrt/auxiliary/tracking/t_debug_hsv_picker.cpp
···
134
134
135
135
switch (xf->format) {
136
136
case XRT_FORMAT_YUV888: process_frame_yuv(d, xf); break;
137
-
case XRT_FORMAT_YUV422: process_frame_yuyv(d, xf); break;
137
+
case XRT_FORMAT_YUYV422: process_frame_yuyv(d, xf); break;
138
138
default:
139
139
fprintf(stderr, "ERROR: Bad format '%s'",
140
140
u_format_str(xf->format));
+1
-1
src/xrt/auxiliary/tracking/t_hsv_filter.c
+1
-1
src/xrt/auxiliary/tracking/t_hsv_filter.c
+5
-5
src/xrt/auxiliary/util/u_format.c
+5
-5
src/xrt/auxiliary/util/u_format.c
···
25
25
case XRT_FORMAT_BITMAP_8X1: return "XRT_FORMAT_BITMAP_8X1";
26
26
case XRT_FORMAT_BITMAP_8X8: return "XRT_FORMAT_BITMAP_8X8";
27
27
case XRT_FORMAT_YUV888: return "XRT_FORMAT_YUV888";
28
-
case XRT_FORMAT_YUV422: return "XRT_FORMAT_YUV422";
28
+
case XRT_FORMAT_YUYV422: return "XRT_FORMAT_YUYV422";
29
29
case XRT_FORMAT_MJPEG: return "XRT_FORMAT_MJPEG";
30
30
default: assert(!"unsupported format"); return 0;
31
31
}
···
44
44
case XRT_FORMAT_BITMAP_8X1:
45
45
case XRT_FORMAT_BITMAP_8X8:
46
46
case XRT_FORMAT_YUV888:
47
-
case XRT_FORMAT_YUV422:
47
+
case XRT_FORMAT_YUYV422:
48
48
// Yes
49
49
return true;
50
50
case XRT_FORMAT_MJPEG:
···
67
67
case XRT_FORMAT_YUV888:
68
68
// Regular one pixel per block formats.
69
69
return 1;
70
-
case XRT_FORMAT_YUV422:
70
+
case XRT_FORMAT_YUYV422:
71
71
// Two pixels per block.
72
72
return 2;
73
73
case XRT_FORMAT_BITMAP_8X8:
···
90
90
case XRT_FORMAT_L8:
91
91
case XRT_FORMAT_BITMAP_8X1:
92
92
case XRT_FORMAT_YUV888:
93
-
case XRT_FORMAT_YUV422:
93
+
case XRT_FORMAT_YUYV422:
94
94
// One pixel high.
95
95
return 1;
96
96
case XRT_FORMAT_BITMAP_8X8:
···
118
118
return 3;
119
119
case XRT_FORMAT_R8G8B8X8:
120
120
case XRT_FORMAT_R8G8B8A8:
121
-
case XRT_FORMAT_YUV422: // Four bytes per two pixels.
121
+
case XRT_FORMAT_YUYV422: // Four bytes per two pixels.
122
122
// 32bit pixel formats.
123
123
return 4;
124
124
case XRT_FORMAT_BITMAP_8X8: // 64 bits.
+16
-16
src/xrt/auxiliary/util/u_sink_converter.c
+16
-16
src/xrt/auxiliary/util/u_sink_converter.c
···
98
98
#endif
99
99
100
100
inline static void
101
-
YUV422_to_R8G8B8X8(const uint8_t *input, uint32_t *rgb1, uint32_t *rgb2)
101
+
YUYV422_to_R8G8B8X8(const uint8_t *input, uint32_t *rgb1, uint32_t *rgb2)
102
102
{
103
103
uint8_t y0 = input[0];
104
104
uint8_t u = input[1];
···
115
115
}
116
116
117
117
inline static void
118
-
YUV422_to_R8G8B8(const uint8_t *input, uint8_t *dst)
118
+
YUYV422_to_R8G8B8(const uint8_t *input, uint8_t *dst)
119
119
{
120
120
uint8_t y0 = input[0];
121
121
uint8_t u = input[1];
···
160
160
}
161
161
162
162
static void
163
-
from_YUV422_to_R8G8B8(struct u_sink_converter *s,
164
-
uint32_t w,
165
-
uint32_t h,
166
-
size_t stride,
167
-
const uint8_t *data)
163
+
from_YUYV422_to_R8G8B8(struct u_sink_converter *s,
164
+
uint32_t w,
165
+
uint32_t h,
166
+
size_t stride,
167
+
const uint8_t *data)
168
168
{
169
169
for (uint32_t y = 0; y < h; y++) {
170
170
for (uint32_t x = 0; x < w; x += 2) {
···
173
173
174
174
src = src + (y * stride) + (x * 2);
175
175
dst = dst + (y * s->frame->stride) + (x * 3);
176
-
YUV422_to_R8G8B8(src, dst);
176
+
YUYV422_to_R8G8B8(src, dst);
177
177
}
178
178
}
179
179
}
···
355
355
case XRT_FORMAT_R8G8B8:
356
356
s->downstream->push_frame(s->downstream, xf);
357
357
return;
358
-
case XRT_FORMAT_YUV422:
358
+
case XRT_FORMAT_YUYV422:
359
359
ensure_data(s, XRT_FORMAT_R8G8B8, xf->width, xf->height);
360
-
from_YUV422_to_R8G8B8(s, xf->width, xf->height, xf->stride,
361
-
xf->data);
360
+
from_YUYV422_to_R8G8B8(s, xf->width, xf->height, xf->stride,
361
+
xf->data);
362
362
break;
363
363
case XRT_FORMAT_YUV888:
364
364
ensure_data(s, XRT_FORMAT_R8G8B8, xf->width, xf->height);
···
392
392
case XRT_FORMAT_R8G8B8:
393
393
s->downstream->push_frame(s->downstream, xf);
394
394
return;
395
-
case XRT_FORMAT_YUV422:
395
+
case XRT_FORMAT_YUYV422:
396
396
ensure_data(s, XRT_FORMAT_R8G8B8, xf->width, xf->height);
397
-
from_YUV422_to_R8G8B8(s, xf->width, xf->height, xf->stride,
398
-
xf->data);
397
+
from_YUYV422_to_R8G8B8(s, xf->width, xf->height, xf->stride,
398
+
xf->data);
399
399
break;
400
400
case XRT_FORMAT_YUV888:
401
401
ensure_data(s, XRT_FORMAT_R8G8B8, xf->width, xf->height);
···
427
427
428
428
switch (xf->format) {
429
429
case XRT_FORMAT_L8:
430
-
case XRT_FORMAT_YUV422:
430
+
case XRT_FORMAT_YUYV422:
431
431
case XRT_FORMAT_YUV888:
432
432
s->downstream->push_frame(s->downstream, xf);
433
433
return;
···
457
457
458
458
459
459
switch (xf->format) {
460
-
case XRT_FORMAT_YUV422:
460
+
case XRT_FORMAT_YUYV422:
461
461
case XRT_FORMAT_YUV888:
462
462
s->downstream->push_frame(s->downstream, xf);
463
463
return;
+1
-1
src/xrt/drivers/v4l2/v4l2_driver.c
+1
-1
src/xrt/drivers/v4l2/v4l2_driver.c
···
489
489
490
490
enum xrt_format format = (enum xrt_format)0;
491
491
switch (interval.pixel_format) {
492
-
case V4L2_PIX_FMT_YUYV: format = XRT_FORMAT_YUV422; break;
492
+
case V4L2_PIX_FMT_YUYV: format = XRT_FORMAT_YUYV422; break;
493
493
case V4L2_PIX_FMT_MJPEG: format = XRT_FORMAT_MJPEG; break;
494
494
default: V_ERROR(vid, "error: Format not supported."); return;
495
495
}