generated from gaoyang3513/SDK_RK3288
[Mod] First commit
This commit is contained in:
@ -0,0 +1,75 @@
|
||||
From 4e5d8be1b0d18453b76fca2c5139222a071dd207 Mon Sep 17 00:00:00 2001
|
||||
From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
|
||||
Date: Mon, 4 Jul 2022 12:05:30 +0200
|
||||
Subject: [PATCH] add some _always_inline_ annotations
|
||||
|
||||
enforce inlining to fix build errors with '-Og'
|
||||
|
||||
fixes #1
|
||||
|
||||
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
|
||||
[Retrieved from:
|
||||
https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/commit/4e5d8be1b0d18453b76fca2c5139222a071dd207]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/convert.c | 5 +++--
|
||||
src/main.c | 5 +++--
|
||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/convert.c b/src/convert.c
|
||||
index c852a14..ec77040 100644
|
||||
--- a/src/convert.c
|
||||
+++ b/src/convert.c
|
||||
@@ -17,8 +17,9 @@
|
||||
#include <stdbool.h>
|
||||
#include <assert.h>
|
||||
#include "bayer2rgb.h"
|
||||
+#include "compiler.h"
|
||||
|
||||
-static bool have_neon()
|
||||
+inline static _always_inline_ bool have_neon()
|
||||
{
|
||||
#ifdef HAVE_NEON
|
||||
return true;
|
||||
@@ -27,7 +28,7 @@ static bool have_neon()
|
||||
#endif
|
||||
}
|
||||
|
||||
-static bool have_cplusplus()
|
||||
+inline static _always_inline_ bool have_cplusplus()
|
||||
{
|
||||
#ifdef HAVE_CPLUSPLUS
|
||||
return true;
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 841a142..087e8e5 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include "src/bayer2rgb.h"
|
||||
#include "src/bayer2rgb-cmdline.h"
|
||||
+#include "src/compiler.h"
|
||||
|
||||
#define BPP_TO_BYTE(_bpp) (((_bpp) + 7) / 8)
|
||||
|
||||
@@ -68,7 +69,7 @@ struct x_image_out {
|
||||
size_t total_size;
|
||||
};
|
||||
|
||||
-inline static bool have_neon(void)
|
||||
+inline static _always_inline_ bool have_neon(void)
|
||||
{
|
||||
#ifdef HAVE_NEON
|
||||
return true;
|
||||
@@ -77,7 +78,7 @@ inline static bool have_neon(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
-static bool have_cplusplus()
|
||||
+inline static _always_inline_ bool have_cplusplus()
|
||||
{
|
||||
#ifdef HAVE_CPLUSPLUS
|
||||
return true;
|
||||
--
|
||||
GitLab
|
||||
|
||||
22
package/bayer2rgb-neon/Config.in
Normal file
22
package/bayer2rgb-neon/Config.in
Normal file
@ -0,0 +1,22 @@
|
||||
config BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_arm && BR2_ARM_CPU_HAS_NEON
|
||||
default y if BR2_aarch64
|
||||
|
||||
config BR2_PACKAGE_BAYER2RGB_NEON
|
||||
bool "bayer2rgb-neon"
|
||||
depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
|
||||
help
|
||||
bayer2rgb-neon is a library which allows
|
||||
to decode raw camera bayer to RGB using
|
||||
NEON hardware acceleration.
|
||||
|
||||
https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb
|
||||
|
||||
comment "bayer2rgb-neon needs a toolchain w/ C++, dynamic library, gcc >= 4.9"
|
||||
depends on BR2_PACKAGE_BAYER2RGB_NEON_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
3
package/bayer2rgb-neon/bayer2rgb-neon.hash
Normal file
3
package/bayer2rgb-neon/bayer2rgb-neon.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 edf451dbb52ad67eb35f9043390bd75ea7228d493c99184aae80b3bd27beab62 bayer2rgb-neon-15feb1115b4828488cc36d09f625e23e8b6a0ec5-br1.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
24
package/bayer2rgb-neon/bayer2rgb-neon.mk
Normal file
24
package/bayer2rgb-neon/bayer2rgb-neon.mk
Normal file
@ -0,0 +1,24 @@
|
||||
################################################################################
|
||||
#
|
||||
# bayer2rgb-neon
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BAYER2RGB_NEON_VERSION = 15feb1115b4828488cc36d09f625e23e8b6a0ec5
|
||||
BAYER2RGB_NEON_SITE = https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb.git
|
||||
BAYER2RGB_NEON_SITE_METHOD = git
|
||||
BAYER2RGB_NEON_LICENSE = GPL-3.0
|
||||
BAYER2RGB_NEON_LICENSE_FILES = COPYING
|
||||
BAYER2RGB_NEON_INSTALL_STAGING = YES
|
||||
BAYER2RGB_NEON_DEPENDENCIES = host-pkgconf host-gengetopt
|
||||
BAYER2RGB_NEON_AUTORECONF = YES
|
||||
|
||||
BAYER2RGB_NEON_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
ifeq ($(BR2_arm),y)
|
||||
BAYER2RGB_NEON_CFLAGS += -mfpu=neon
|
||||
endif
|
||||
|
||||
BAYER2RGB_NEON_CONF_ENV = CFLAGS="$(BAYER2RGB_NEON_CFLAGS)"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user