Age | Commit message (Collapse) | Author |
|
Add a test to verify file creation with File::open(). The test is
expected to fail as the File::open() implementation is not correct.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
|
|
Add tests for the File::read() and File::write() functions.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
|
|
The return value of write() function is ignored, causing the following
compiler error|warning with gcc version 5.4
error: ignoring return value of 'ssize_t write(int, const void*, size_t)'
Fix this by storing the return value of write() and return a test error in
case of failure.
Reported-by: Coverity CID=284605
Signed-off-by: Madhavan Krishnan <madhavan.krishnan@linaro.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
The libcamera internal headers are located in src/libcamera/include/.
The directory is added to the compiler headers search path with a meson
include_directories() directive, and internal headers are included with
(e.g. for the internal semaphore.h header)
#include "semaphore.h"
All was well, until libcxx decided to implement the C++20
synchronization library. The __threading_support header gained a
#include <semaphore.h>
to include the pthread's semaphore support. As include_directories()
adds src/libcamera/include/ to the compiler search path with -I, the
internal semaphore.h is included instead of the pthread version.
Needless to say, the compiler isn't happy.
Three options have been considered to fix this issue:
- Use -iquote instead of -I. The -iquote option instructs gcc to only
consider the header search path for headers included with the ""
version. Meson unfortunately doesn't support this option.
- Rename the internal semaphore.h header. This was deemed to be the
beginning of a long whack-a-mole game, where namespace clashes with
system libraries would appear over time (possibly dependent on
particular system configurations) and would need to be constantly
fixed.
- Move the internal headers to another directory to create a unique
namespace through path components. This causes lots of churn in all
the existing source files through the all project.
The first option would be best, but isn't available to us due to missing
support in meson. Even if -iquote support was added, we would need to
fix the problem before a new version of meson containing the required
support would be released.
The third option is thus the only practical solution available. Bite the
bullet, and do it, moving headers to include/libcamera/internal/.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>
|
f='#n144'>144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Copyright (C) 2019, Google Inc.
*
* Convert buffer to RGB
*/
#include "format_converter.h"
#include <errno.h>
#include <utility>
#include <QImage>
#include <libcamera/formats.h>
#include "../common/image.h"
#define RGBSHIFT 8
#ifndef MAX
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
#endif
#ifndef CLAMP
#define CLAMP(a,low,high) MAX((low),MIN((high),(a)))
#endif
#ifndef CLIP
#define CLIP(x) CLAMP(x,0,255)
#endif
int FormatConverter::configure(const libcamera::PixelFormat &format,
const QSize &size, unsigned int stride)
{
switch (format) {
case libcamera::formats::NV12:
formatFamily_ = YUVSemiPlanar;
horzSubSample_ = 2;
vertSubSample_ = 2;
nvSwap_ = false;
break;
case libcamera::formats::NV21:
formatFamily_ = YUVSemiPlanar;
horzSubSample_ = 2;
vertSubSample_ = 2;
nvSwap_ = true;
break;
case libcamera::formats::NV16:
formatFamily_ = YUVSemiPlanar;
horzSubSample_ = 2;
vertSubSample_ = 1;
nvSwap_ = false;
break;
case libcamera::formats::NV61:
formatFamily_ = YUVSemiPlanar;
horzSubSample_ = 2;
vertSubSample_ = 1;
nvSwap_ = true;
break;
case libcamera::formats::NV24:
formatFamily_ = YUVSemiPlanar;
horzSubSample_ = 1;
vertSubSample_ = 1;
nvSwap_ = false;
break;
case libcamera::formats::NV42:
formatFamily_ = YUVSemiPlanar;
horzSubSample_ = 1;
vertSubSample_ = 1;
nvSwap_ = true;
break;
case libcamera::formats::R8:
formatFamily_ = RGB;
r_pos_ = 0;
g_pos_ = 0;
b_pos_ = 0;
bpp_ = 1;
break;
case libcamera::formats::RGB888:
formatFamily_ = RGB;
r_pos_ = 2;
g_pos_ = 1;
b_pos_ = 0;
bpp_ = 3;
break;
case libcamera::formats::BGR888:
formatFamily_ = RGB;
r_pos_ = 0;
g_pos_ = 1;
b_pos_ = 2;
bpp_ = 3;
break;
case libcamera::formats::ARGB8888:
case libcamera::formats::XRGB8888:
formatFamily_ = RGB;
r_pos_ = 2;
g_pos_ = 1;
b_pos_ = 0;
bpp_ = 4;
break;
case libcamera::formats::RGBA8888:
case libcamera::formats::RGBX8888:
formatFamily_ = RGB;
r_pos_ = 3;
g_pos_ = 2;
b_pos_ = 1;
bpp_ = 4;
break;
case libcamera::formats::ABGR8888:
case libcamera::formats::XBGR8888:
formatFamily_ = RGB;
r_pos_ = 0;
g_pos_ = 1;
b_pos_ = 2;
bpp_ = 4;
break;
case libcamera::formats::BGRA8888:
case libcamera::formats::BGRX8888:
formatFamily_ = RGB;
r_pos_ = 1;
g_pos_ = 2;
b_pos_ = 3;
bpp_ = 4;
break;
case libcamera::formats::VYUY:
formatFamily_ = YUVPacked;
y_pos_ = 1;
cb_pos_ = 2;
break;
case libcamera::formats::YVYU:
formatFamily_ = YUVPacked;
y_pos_ = 0;
cb_pos_ = 3;
break;
case libcamera::formats::UYVY:
formatFamily_ = YUVPacked;
y_pos_ = 1;
cb_pos_ = 0;
break;
case libcamera::formats::YUYV:
formatFamily_ = YUVPacked;
y_pos_ = 0;
cb_pos_ = 1;
break;
case libcamera::formats::YUV420:
formatFamily_ = YUVPlanar;
horzSubSample_ = 2;
vertSubSample_ = 2;
nvSwap_ = false;
break;
case libcamera::formats::YVU420:
formatFamily_ = YUVPlanar;
horzSubSample_ = 2;
vertSubSample_ = 2;
nvSwap_ = true;
break;
case libcamera::formats::YUV422:
formatFamily_ = YUVPlanar;
horzSubSample_ = 2;
vertSubSample_ = 1;
nvSwap_ = false;
break;
case libcamera::formats::MJPEG:
formatFamily_ = MJPEG;
break;
default:
return -EINVAL;
};
format_ = format;
width_ = size.width();
height_ = size.height();
stride_ = stride;
return 0;
}
void FormatConverter::convert(const Image *src, size_t size, QImage *dst)
{
switch (formatFamily_) {
case MJPEG:
dst->loadFromData(src->data(0).data(), size, "JPEG");
break;
case RGB:
convertRGB(src, dst->bits());
break;
case YUVPacked:
convertYUVPacked(src, dst->bits());
break;
case YUVSemiPlanar:
convertYUVSemiPlanar(src, dst->bits());
break;
case YUVPlanar:
convertYUVPlanar(src, dst->bits());
break;
};
}
static void yuv_to_rgb(int y, int u, int v, int *r, int *g, int *b)
{
int c = y - 16;
int d = u - 128;
int e = v - 128;
*r = CLIP(( 298 * c + 409 * e + 128) >> RGBSHIFT);
*g = CLIP(( 298 * c - 100 * d - 208 * e + 128) >> RGBSHIFT);
*b = CLIP(( 298 * c + 516 * d + 128) >> RGBSHIFT);
}
void FormatConverter::convertRGB(const Image *srcImage, unsigned char *dst)
{
const unsigned char *src = srcImage->data(0).data();
unsigned int x, y;
int r, g, b;
for (y = 0; y < height_; y++) {
for (x = 0; x < width_; x++) {
r = src[bpp_ * x + r_pos_];
g = src[bpp_ * x + g_pos_];
b = src[bpp_ * x + b_pos_];
dst[4 * x + 0] = b;
dst[4 * x + 1] = g;
dst[4 * x + 2] = r;
dst[4 * x + 3] = 0xff;
}
src += stride_;
dst += width_ * 4;
}
}
void FormatConverter::convertYUVPacked(const Image *srcImage, unsigned char *dst)
{
const unsigned char *src = srcImage->data(0).data();
unsigned int src_x, src_y, dst_x, dst_y;
unsigned int src_stride;
unsigned int dst_stride;
unsigned int cr_pos;
int r, g, b, y, cr, cb;
cr_pos = (cb_pos_ + 2) % 4;
src_stride = stride_;
dst_stride = width_ * 4;
for (src_y = 0, dst_y = 0; dst_y < height_; src_y++, dst_y++) {
for (src_x = 0, dst_x = 0; dst_x < width_; ) {
cb = src[src_y * src_stride + src_x * 4 + cb_pos_];
cr = src[src_y * src_stride + src_x * 4 + cr_pos];
y = src[src_y * src_stride + src_x * 4 + y_pos_];
yuv_to_rgb(y, cb, cr, &r, &g, &b);
dst[dst_y * dst_stride + 4 * dst_x + 0] = b;
dst[dst_y * dst_stride + 4 * dst_x + 1] = g;
dst[dst_y * dst_stride + 4 * dst_x + 2] = r;
dst[dst_y * dst_stride + 4 * dst_x + 3] = 0xff;
dst_x++;
y = src[src_y * src_stride + src_x * 4 + y_pos_ + 2];
yuv_to_rgb(y, cb, cr, &r, &g, &b);
dst[dst_y * dst_stride + 4 * dst_x + 0] = b;
dst[dst_y * dst_stride + 4 * dst_x + 1] = g;
dst[dst_y * dst_stride + 4 * dst_x + 2] = r;
dst[dst_y * dst_stride + 4 * dst_x + 3] = 0xff;
dst_x++;
src_x++;
}
}
}
void FormatConverter::convertYUVPlanar(const Image *srcImage, unsigned char *dst)
{
unsigned int c_stride = stride_ / horzSubSample_;
unsigned int c_inc = horzSubSample_ == 1 ? 1 : 0;
const unsigned char *src_y = srcImage->data(0).data();
const unsigned char *src_cb = srcImage->data(1).data();
const unsigned char *src_cr = srcImage->data(2).data();
int r, g, b;
if (nvSwap_)
std::swap(src_cb, src_cr);
for (unsigned int y = 0; y < height_; y++) {
const unsigned char *line_y = src_y + y * stride_;
const unsigned char *line_cb = src_cb + (y / vertSubSample_) *
c_stride;
const unsigned char *line_cr = src_cr + (y / vertSubSample_) *
c_stride;
for (unsigned int x = 0; x < width_; x += 2) {
yuv_to_rgb(*line_y, *line_cb, *line_cr, &r, &g, &b);
dst[0] = b;
dst[1] = g;
dst[2] = r;
dst[3] = 0xff;
line_y++;
line_cb += c_inc;
line_cr += c_inc;
dst += 4;
yuv_to_rgb(*line_y, *line_cb, *line_cr, &r, &g, &b);
dst[0] = b;
dst[1] = g;
dst[2] = r;
dst[3] = 0xff;
line_y++;
line_cb += 1;
line_cr += 1;
dst += 4;
}
}
}
void FormatConverter::convertYUVSemiPlanar(const Image *srcImage, unsigned char *dst)
{
unsigned int c_stride = stride_ * (2 / horzSubSample_);
unsigned int c_inc = horzSubSample_ == 1 ? 2 : 0;
unsigned int cb_pos = nvSwap_ ? 1 : 0;
unsigned int cr_pos = nvSwap_ ? 0 : 1;
const unsigned char *src = srcImage->data(0).data();
const unsigned char *src_c = srcImage->data(1).data();
int r, g, b;
for (unsigned int y = 0; y < height_; y++) {
const unsigned char *src_y = src + y * stride_;
const unsigned char *src_cb = src_c + (y / vertSubSample_) *
c_stride + cb_pos;
const unsigned char *src_cr = src_c + (y / vertSubSample_) *
c_stride + cr_pos;
for (unsigned int x = 0; x < width_; x += 2) {
yuv_to_rgb(*src_y, *src_cb, *src_cr, &r, &g, &b);
dst[0] = b;
dst[1] = g;
dst[2] = r;
dst[3] = 0xff;
src_y++;
src_cb += c_inc;
src_cr += c_inc;
dst += 4;
yuv_to_rgb(*src_y, *src_cb, *src_cr, &r, &g, &b);
dst[0] = b;
dst[1] = g;
dst[2] = r;
dst[3] = 0xff;
src_y++;
src_cb += 2;
src_cr += 2;
dst += 4;
}
}
}
|