[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-396-g29d98ceb6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-396-g29d98ceb6
|
From: sszy <ss...@us...> - 2024-02-08 23:28:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 29d98ceb696c05511150b5b754a3d0773f125c63 (commit)
via 93e6b7572ef39b39d8fa439629533ba24cdff2c8 (commit)
via 0b3a6711844530be9222bfd9fdeffc15f426b74f (commit)
from 661aafd78004df2422a955a59230a2b206f997dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 29d98ceb696c05511150b5b754a3d0773f125c63
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Feb 9 00:28:26 2024 +0100
[BUILDROOT] opos8mm-legacy-5.10_defconfig: add some missing useful packages
commit 93e6b7572ef39b39d8fa439629533ba24cdff2c8
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Feb 8 17:28:09 2024 +0100
[BUILD] help: legacy-5.10 is the default supported OPOS8MM config
commit 0b3a6711844530be9222bfd9fdeffc15f426b74f
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Feb 8 17:26:03 2024 +0100
[DEMOS] capture: add support for BAYER BGGR8 camera format
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
buildroot/configs/opos8mm-legacy-5.10_defconfig | 16 ++++++++++
target/demos/camera/capture/capture.c | 41 ++++++++++++++++++++++++-
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index cf59c60e8..fee1f37e4 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ help:
@echo ' opos6ul_legacy_defconfig - get default config for an OPOS6UL+Dev kit (3.14 Freescale kernel)'
@echo ' opos6ulnano_defconfig - get default config for an OPOS6ULNANO+Dev kit (4.9+ mainline/vanilla kernel)'
@echo ' opos6ulsp_defconfig - get default config for an OPOS6ULSP+Dev kit (4.19+ mainline/vanilla kernel)'
- @echo ' opos8mm-legacy-5.4_defconfig - get default config for an OPOS8MM+Dev kit (5.4 NXP kernel)'
+ @echo ' opos8mm-legacy-5.10_defconfig - get default config for an OPOS8MM+Dev kit (5.10 NXP kernel)'
@echo ''
@echo 'Build:'
@echo ' all - make world '
diff --git a/buildroot/configs/opos8mm-legacy-5.10_defconfig b/buildroot/configs/opos8mm-legacy-5.10_defconfig
index d3472dc54..b5564119a 100644
--- a/buildroot/configs/opos8mm-legacy-5.10_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.10_defconfig
@@ -33,6 +33,8 @@ BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_DEMOS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
BR2_PACKAGE_ALSA_UTILS_ACONNECT=y
@@ -71,6 +73,9 @@ BR2_PACKAGE_GST1_IMX2_G2D=y
BR2_PACKAGE_GST1_IMX2_VPU=y
BR2_PACKAGE_GST1_LIBAV=y
BR2_PACKAGE_GST1_RTSP_SERVER=y
+BR2_PACKAGE_V4L2GRAB=y
+BR2_PACKAGE_V4L2LOOPBACK=y
+BR2_PACKAGE_V4L2LOOPBACK_UTILS=y
BR2_PACKAGE_YAVTA=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
@@ -83,14 +88,19 @@ BR2_PACKAGE_TREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
+BR2_PACKAGE_SL=y
BR2_PACKAGE_GLMARK2=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FBV=y
+BR2_PACKAGE_SDL_MIXER=y
+BR2_PACKAGE_SDL_NET=y
BR2_PACKAGE_MURATA_CYW_FW=y
BR2_PACKAGE_MURATA_CYW_FW_CYW43455=y
BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW=y
+BR2_PACKAGE_CPUBURN_ARM=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y
@@ -105,8 +115,10 @@ BR2_PACKAGE_HWDATA_IAB_OUI_TXT=y
BR2_PACKAGE_HWDATA_PNP_IDS=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_LIBIMXDMABUFFER=y
+BR2_PACKAGE_PICOCOM=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_USB_MODESWITCH=y
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
@@ -118,6 +130,7 @@ BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBIMXVPUAPI2=y
BR2_PACKAGE_LIBIMXVPUAPI2_IMX8MM=y
BR2_PACKAGE_LIBTIRPC=y
+BR2_PACKAGE_HAVEGED=y
BR2_PACKAGE_BLUEZ_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
@@ -131,9 +144,12 @@ BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_GESFTPSERVER=y
+BR2_PACKAGE_HOSTAPD=y
+BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IW=y
BR2_PACKAGE_LINKS=y
+BR2_PACKAGE_LRZSZ=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 662004638..94d1004b3 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -510,6 +510,42 @@ static void jpeg_to_rgb(int desired_width, int desired_height,
return;
}
+static void simple_bayer_to_rgb(void *bayer_src, int size, int line_size, int img_pix_height, void *rgb_dst, int dst_bpp)
+{
+ Uint32 *dest32 = (Uint32*)rgb_dst;
+ Uint8 *src = (Uint8 *)bayer_src;
+ int i, j, pos = 0;
+ Uint8 R, G, B, A;
+ Uint16 pixel;
+ static int first_time = 1;
+
+ if (first_time) {
+ fprintf(stdout, "%s: image size %d line size %d\n", __func__, size, line_size);
+ first_time = 0;
+ }
+
+ if (dst_bpp == 32) {
+ for (j = 0; j < img_pix_height-1; j++) {
+ for (i = 0; i < line_size; i++) {
+ B = src[i + (j*line_size)];
+ G = src[i+1 + (j*line_size)];
+ R = src[i+1 + line_size + (j*line_size)];
+ *dest32++ = (R << 16) | (G << 8) | B;
+ i++;
+ B = src[i-1 + (j*line_size)];
+ G = src[i + (j*line_size)];
+ R = src[i + line_size + (j*line_size)];
+ *dest32++ = (R << 16) | (G << 8) | B;
+ }
+ }
+ } else {
+ fprintf(stdout, "%s: unsupported screen bpp (%d)\n", __func__, dst_bpp);
+ }
+ //fprintf(stdout, "%s: %d x %d\n", __func__, i, j);
+}
+
+
+
static void simple_copy(void *yuv, int size, void* rgb)
{
memcpy(rgb, yuv, size);
@@ -535,6 +571,8 @@ static void process_image(/*const */void *pCaptured, int size)
rgb565_to_rgb(pCaptured, mycamera.sizeimage, image->pixels, screen->format->BitsPerPixel);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_JPEG) {
jpeg_to_rgb(mycamera.width, mycamera.height, image->pixels, (char *)pCaptured, size);
+ } else if (mycamera.pixelformat == V4L2_PIX_FMT_SRGGB8) {
+ simple_bayer_to_rgb(pCaptured, mycamera.sizeimage, mycamera.width, mycamera.height, image->pixels, screen->format->BitsPerPixel);
} else if (mycamera.pixelformat == V4L2_PIX_FMT_SGRBG8) {
BAYERToRGB(&_GR8, &_BRG32,
(char *)pCaptured, image->pixels, mycamera.width, mycamera.height,
@@ -1091,7 +1129,8 @@ static Uint32 get_a_supported_pix_fmt(void)
}
if ((fmtdesc.pixelformat == V4L2_PIX_FMT_RGB565) ||
(fmtdesc.pixelformat == V4L2_PIX_FMT_RGB32) ||
- (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB24) ) {
+ (fmtdesc.pixelformat == V4L2_PIX_FMT_RGB24) ||
+ (fmtdesc.pixelformat == V4L2_PIX_FMT_SRGGB8) ) {
fprintf(stdout, "Using camera format %d (%c%c%c%c)\n", i, FOURCC_TO_STR(fmtdesc.pixelformat));
ret = fmtdesc.pixelformat;
goto end_of_fmt;
hooks/post-receive
--
armadeus
|