Merge pull request #801 from sonydevworld/develop

Merge from develop v3.3.0

LICENSE

@@ -1744,3 +1744,55 @@ Download:
 https://github.com/kmackay/micro-ecc.git
 
 ========================================================================
+
+20. License of multi_webcamera host
+
+========================================================================
+examples/multi_webcamera/host/linux_video
+
+This software is used on linux and distributed subject to the licensing
+described in the following file:
+
+  examples/multi_webcamera/host/linux_video/LICENSE
+
+
+examples/multi_webcamera/host/python
+
+This script is used on linux and distributed subject to the following
+licensing descriiption:
+
+BSD-3-Clause
+------------------------------------------------------------------------
+  Copyright 2019, 2020 Sony Semiconductor Solutions Corporation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+3. Neither the name of Sony Semiconductor Solutions Corporation nor
+   the names of its contributors may be used to endorse or promote
+   products derived from this software without specific prior written
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+------------------------------------------------------------------------
+
+========================================================================
+

examples/audio_beep/Makefile

@@ -47,14 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_BEEP)
 
 MAINSRC = audio_beep_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
-
 CXXFLAGS += -D_POSIX
 
 include $(APPDIR)/Application.mk

examples/audio_dual_players/Makefile

@@ -47,14 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_DUAL_PLAYERS)
 
 MAINSRC = audio_dual_players_main.cxx
 
-# Audio Example paths
-
-#AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-# XXX: Do NOT add module directory, please use modules/include.
-#CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 CXXFLAGS += -D_POSIX
 CXXFLAGS += -DUSE_MEMMGR_FENCE
 CXXFLAGS += -DATTENTION_USE_FILENAME_LINE

examples/audio_oscillator/Makefile

@@ -54,7 +54,6 @@ AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
 
 # Audio oscillator Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)$(DELIM)include
 CXXFLAGS += ${INCDIR_PREFIX}worker_oscillator$(DELIM)userproc$(DELIM)include
 ifeq ($(CONFIG_EXAMPLES_AUDIO_OSCILLATOR_USEPOSTPROC),y)

examples/audio_pcm_capture/Makefile

@@ -47,13 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_PCM_CAPTURE)
 
 MAINSRC = audio_pcm_capture_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 CXXFLAGS += -D_POSIX
 CXXFLAGS += -DUSE_MEMMGR_FENCE
 CXXFLAGS += -DATTENTION_USE_FILENAME_LINE

examples/audio_pcm_capture_objif/Makefile

@@ -47,14 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_PCM_CAPTURE_OBJIF)
 
 MAINSRC = audio_pcm_capture_objif_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
-
 CXXFLAGS += -D_POSIX
 CXXFLAGS += -DUSE_MEMMGR_FENCE
 CXXFLAGS += -DATTENTION_USE_FILENAME_LINE

examples/audio_player/Makefile

@@ -47,13 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_PLAYER)
 
 MAINSRC = audio_player_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 ifeq ($(CONFIG_EXAMPLES_AUDIO_PLAYER_USEPOSTPROC),y)
 CXXFLAGS += ${INCDIR_PREFIX}worker$(DELIM)userproc$(DELIM)include
 endif

examples/audio_player_objif/Makefile

@@ -47,13 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_PLAYER_OBJIF)
 
 MAINSRC = audio_player_objif_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 ifeq ($(CONFIG_EXAMPLES_AUDIO_PLAYER_OBJIF_USEPOSTPROC),y)
 CXXFLAGS += ${INCDIR_PREFIX}worker$(DELIM)userproc$(DELIM)include
 endif

examples/audio_recognizer/Makefile

@@ -47,13 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_RECOGNIZER)
 
 MAINSRC = audio_recognizer_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 CXXFLAGS += ${INCDIR_PREFIX}worker_recognizer$(DELIM)userproc$(DELIM)include
 ifeq ($(CONFIG_EXAMPLES_AUDIO_RECOGNIZER_USEPREPROC),y)
 CXXFLAGS += ${INCDIR_PREFIX}worker_preprocess$(DELIM)userproc$(DELIM)include

examples/audio_recorder/Makefile

@@ -48,13 +48,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_RECORDER)
 CXXSRCS = audio_util.cxx
 MAINSRC = audio_recorder_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 ifeq ($(CONFIG_EXAMPLES_AUDIO_RECORDER_USEPREPROC),y)
 CXXFLAGS += ${INCDIR_PREFIX}worker$(DELIM)userproc$(DELIM)include
 endif

examples/audio_recorder_objif/Makefile

@@ -47,13 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_RECORDER_OBJIF)
 
 MAINSRC = audio_recorder_objif_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
 ifeq ($(CONFIG_EXAMPLES_AUDIO_RECORDER_OBJIF_USEPREPROC),y)
 CXXFLAGS += ${INCDIR_PREFIX}worker$(DELIM)userproc$(DELIM)include
 endif

examples/audio_sound_effector/Makefile

@@ -47,14 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_SOUND_EFFECTOR)
 
 MAINSRC = audio_sound_effector.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
-
 CXXFLAGS += -D_POSIX
 CXXFLAGS += -DUSE_MEMMGR_FENCE
 CXXFLAGS += -DATTENTION_USE_FILENAME_LINE

examples/audio_through/Makefile

@@ -47,14 +47,8 @@ MODULE    = $(CONFIG_EXAMPLES_AUDIO_THROUGH)
 
 MAINSRC = audio_through_main.cxx
 
-# Audio Example paths
-
-AUDIODIR = $(SDKDIR)$(DELIM)modules$(DELIM)audio
-
 # Audio Example flags
 
-CXXFLAGS += ${INCDIR_PREFIX}$(AUDIODIR)
-
 CXXFLAGS += -D_POSIX
 CXXFLAGS += -DUSE_MEMMGR_FENCE
 CXXFLAGS += -DATTENTION_USE_FILENAME_LINE

examples/audiolite_fft/.gitignore

@@ -0,0 +1,12 @@
+/Make.dep
+/.depend
+/.built
+/*.asm
+/*.obj
+/*.rel
+/*.lst
+/*.sym
+/*.adb
+/*.lib
+/*.src
+/*.spk

examples/audiolite_fft/Kconfig

@@ -0,0 +1,26 @@
+
+config EXAMPLES_AUDIOLITE_FFT
+	tristate "AudioLite sample : audiolite_fft app"
+	default n
+	---help---
+		Enable the audiolite_fft app. This example includes how to make
+		user original audiolite component with worker (sub-core) off-load.
+
+if EXAMPLES_AUDIOLITE_FFT
+
+config EXAMPLES_AUDIOLITE_FFT_PROGNAME
+	string "Program name"
+	default "audiolite_fft"
+	---help---
+		This is the name of the program that will be use when the NSH ELF
+		program is installed.
+
+config EXAMPLES_AUDIOLITE_FFT_PRIORITY
+	int "audiolite_fft task priority"
+	default 100
+
+config EXAMPLES_AUDIOLITE_FFT_STACKSIZE
+	int "audiolite_fft stack size"
+	default 2048
+
+endif

examples/audiolite_fft/Make.defs

@@ -0,0 +1,4 @@
+
+ifneq ($(CONFIG_EXAMPLES_AUDIOLITE_FFT),)
+CONFIGURED_APPS += audiolite_fft
+endif

examples/audiolite_fft/Makefile

@@ -0,0 +1,26 @@
+
+include $(APPDIR)/Make.defs
+include $(SDKDIR)/Make.defs
+
+PROGNAME = $(CONFIG_EXAMPLES_AUDIOLITE_FFT_PROGNAME)
+PRIORITY = $(CONFIG_EXAMPLES_AUDIOLITE_FFT_PRIORITY)
+STACKSIZE = $(CONFIG_EXAMPLES_AUDIOLITE_FFT_STACKSIZE)
+MODULE = $(CONFIG_EXAMPLES_AUDIOLITE_FFT)
+
+ASRCS =
+CSRCS =
+MAINSRC = audiolite_fft_main.cxx
+
+CXXSRCS += alusr_fftworker.cxx
+
+include $(APPDIR)/Application.mk
+
+build_fftworker_worker:
+	@$(MAKE) -C fftworker TOPDIR="$(TOPDIR)" SDKDIR="$(SDKDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
+
+clean_fftworker_worker:
+	@$(MAKE) -C fftworker TOPDIR="$(TOPDIR)" SDKDIR="$(SDKDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean
+
+$(OBJS): build_fftworker_worker
+
+clean:: clean_fftworker_worker