Merge pull request #28 from SPRESENSE/release-v1.2.0

Merge release-v1.2.0 into master for v1.2.0 release
sonydevworld · Mar 15, 2019 · af00915 · af00915
2 parents 5d54b56 + 7e84ad4
commit af00915
Show file tree

Hide file tree

Showing 1,238 changed files with 292,594 additions and 13,246 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1562,3 +1562,11 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 ========================================================================
+
+5. License of libjpeg
+
+========================================================================
+externals/libjpeg
+
+this software is based in part on the work of the Independent JPEG Group.
+========================================================================
diff --git a/examples/Application.mk b/examples/Application.mk
@@ -64,9 +64,8 @@ else
   INSTALL_DIR = $(BIN_DIR)
 endif
 
-ROOTDEPPATH = --dep-path .
-
-VPATH =
+ROOTDEPPATH += --dep-path .
+VPATH +=
 
 all: .built
 .PHONY: clean preconfig depend distclean

diff --git a/examples/asmp/asmp_main.c b/examples/asmp/asmp_main.c
@@ -135,7 +135,7 @@ static int run_worker(const char *filename)
   ret = mptask_assign(&mptask);
   if (ret != 0)
     {
-      err("mptask_asign() failure. %d\n", ret);
+      err("mptask_assign() failure. %d\n", ret);
       return ret;
     }
 
@@ -154,7 +154,7 @@ static int run_worker(const char *filename)
       return ret;
     }
 
-  /* Initialize MP message queue with asigned CPU ID, and bind it to MP task */
+  /* Initialize MP message queue with assigned CPU ID, and bind it to MP task */
 
   ret = mpmq_init(&mq, KEY_MQ, mptask_getcpuid(&mptask));
   if (ret < 0)

diff --git a/examples/audio_player/audio_player_main.cxx b/examples/audio_player/audio_player_main.cxx
@@ -58,7 +58,7 @@
 #include "include/pool_layout.h"
 #include "include/fixed_fence.h"
 #ifdef CONFIG_AUDIOUTILS_PLAYLIST
-#  include "playlist/playlist.h"
+#include <audio/utilities/playlist.h>
 #endif
 
 using namespace MemMgrLite;

diff --git a/examples/audio_player/config/mem_layout.conf b/examples/audio_player/config/mem_layout.conf
@@ -87,8 +87,8 @@ MemoryDevices.init(
 #
 FixedAreas.init(
   # name,                  device,    align,        size,         fence
-  ["AUDIO_WORK_AREA",     "AUD_SRAM", U_STD_ALIGN,  0x0003e000,   false], # Audio work area
-  ["MSG_QUE_AREA",        "AUD_SRAM", U_STD_ALIGN,  0x00001000,   false], # message queue area 
+  ["AUDIO_WORK_AREA",     "AUD_SRAM", U_STD_ALIGN,  0x0003d000,   false], # Audio work area
+  ["MSG_QUE_AREA",        "AUD_SRAM", U_STD_ALIGN,  0x00002000,   false], # message queue area
   ["MEMMGR_WORK_AREA",    "AUD_SRAM", U_STD_ALIGN,  0x00000200,   false], # MemMgrLite WORK Area
   ["MEMMGR_DATA_AREA",    "AUD_SRAM", U_STD_ALIGN,  0x00000100,   false], # MemMgrLite DATA Area
   nil # end of definition

diff --git a/examples/audio_player/config/msgq_layout.conf b/examples/audio_player/config/msgq_layout.conf
@@ -71,7 +71,7 @@
 MsgQuePool = [
 # [ ID,                                             n_size  n_num  h_size  h_num
   # For Audio
-  ["MSGQ_AUD_MNG",                                     88,    4,     0,      0],
+  ["MSGQ_AUD_MNG",                                     88,   30,     0,      0],
   ["MSGQ_AUD_APP",                                     64,    2,     0,      0],
   ["MSGQ_AUD_DSP",                                     20,    5,     0,      0],
   ["MSGQ_AUD_PFDSP0",                                  20,    5,     0,      0],

diff --git a/examples/audio_player/include/fixed_fence.h b/examples/audio_player/include/fixed_fence.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * audio_player/include/fixed_fence.h
+ * fixed_fence.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *

diff --git a/examples/audio_player/include/mem_layout.h b/examples/audio_player/include/mem_layout.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * audio_player/include/mem_layout.h
+ * mem_layout.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
@@ -49,12 +49,12 @@
 #define AUDIO_WORK_AREA_ALIGN   0x00000008
 #define AUDIO_WORK_AREA_ADDR    0x000c0000
 #define AUDIO_WORK_AREA_DRM     0x000c0000 /* _DRM is obsolete macro. to use _ADDR */
-#define AUDIO_WORK_AREA_SIZE    0x0003e000
+#define AUDIO_WORK_AREA_SIZE    0x0003d000
 
 #define MSG_QUE_AREA_ALIGN   0x00000008
-#define MSG_QUE_AREA_ADDR    0x000fe000
-#define MSG_QUE_AREA_DRM     0x000fe000 /* _DRM is obsolete macro. to use _ADDR */
-#define MSG_QUE_AREA_SIZE    0x00001000
+#define MSG_QUE_AREA_ADDR    0x000fd000
+#define MSG_QUE_AREA_DRM     0x000fd000 /* _DRM is obsolete macro. to use _ADDR */
+#define MSG_QUE_AREA_SIZE    0x00002000
 
 #define MEMMGR_WORK_AREA_ALIGN   0x00000008
 #define MEMMGR_WORK_AREA_ADDR    0x000ff000
@@ -159,6 +159,6 @@
 #define L0_PF1_APU_CMD_POOL_NUM_SEG  0x0000000a
 #define L0_PF1_APU_CMD_POOL_SEG_SIZE 0x0000005c
 
-/* Remainder AUDIO_WORK_AREA=0x000168c4 */
+/* Remainder AUDIO_WORK_AREA=0x000158c4 */
 
 #endif /* MEM_LAYOUT_H_INCLUDED */
diff --git a/examples/audio_player/include/msgq_id.h b/examples/audio_player/include/msgq_id.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * audio_player/include/msgq_id.h
+ * msgq_id.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
@@ -36,9 +36,9 @@
 #ifndef MSGQ_ID_H_INCLUDED
 #define MSGQ_ID_H_INCLUDED
 
-/* Message area size: 3808 bytes */
-#define MSGQ_TOP_DRM	0xfe000
-#define MSGQ_END_DRM	0xfeee0
+/* Message area size: 6096 bytes */
+#define MSGQ_TOP_DRM	0xfd000
+#define MSGQ_END_DRM	0xfe7d0
 
 /* Message area fill value after message poped */
 #define MSG_FILL_VALUE_AFTER_POP	0x0
@@ -65,96 +65,96 @@
 /* User defined constants */
 
 /************************************************************************/
-#define MSGQ_AUD_MNG_QUE_BLOCK_DRM	0xfe044
-#define MSGQ_AUD_MNG_N_QUE_DRM	0xfe374
+#define MSGQ_AUD_MNG_QUE_BLOCK_DRM	0xfd044
+#define MSGQ_AUD_MNG_N_QUE_DRM	0xfd374
 #define MSGQ_AUD_MNG_N_SIZE	88
-#define MSGQ_AUD_MNG_N_NUM	4
+#define MSGQ_AUD_MNG_N_NUM	30
 #define MSGQ_AUD_MNG_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_MNG_H_SIZE	0
 #define MSGQ_AUD_MNG_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_APP_QUE_BLOCK_DRM	0xfe088
-#define MSGQ_AUD_APP_N_QUE_DRM	0xfe4d4
+#define MSGQ_AUD_APP_QUE_BLOCK_DRM	0xfd088
+#define MSGQ_AUD_APP_N_QUE_DRM	0xfddc4
 #define MSGQ_AUD_APP_N_SIZE	64
 #define MSGQ_AUD_APP_N_NUM	2
 #define MSGQ_AUD_APP_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_APP_H_SIZE	0
 #define MSGQ_AUD_APP_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_DSP_QUE_BLOCK_DRM	0xfe0cc
-#define MSGQ_AUD_DSP_N_QUE_DRM	0xfe554
+#define MSGQ_AUD_DSP_QUE_BLOCK_DRM	0xfd0cc
+#define MSGQ_AUD_DSP_N_QUE_DRM	0xfde44
 #define MSGQ_AUD_DSP_N_SIZE	20
 #define MSGQ_AUD_DSP_N_NUM	5
 #define MSGQ_AUD_DSP_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_DSP_H_SIZE	0
 #define MSGQ_AUD_DSP_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_PFDSP0_QUE_BLOCK_DRM	0xfe110
-#define MSGQ_AUD_PFDSP0_N_QUE_DRM	0xfe5b8
+#define MSGQ_AUD_PFDSP0_QUE_BLOCK_DRM	0xfd110
+#define MSGQ_AUD_PFDSP0_N_QUE_DRM	0xfdea8
 #define MSGQ_AUD_PFDSP0_N_SIZE	20
 #define MSGQ_AUD_PFDSP0_N_NUM	5
 #define MSGQ_AUD_PFDSP0_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_PFDSP0_H_SIZE	0
 #define MSGQ_AUD_PFDSP0_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_PFDSP1_QUE_BLOCK_DRM	0xfe154
-#define MSGQ_AUD_PFDSP1_N_QUE_DRM	0xfe61c
+#define MSGQ_AUD_PFDSP1_QUE_BLOCK_DRM	0xfd154
+#define MSGQ_AUD_PFDSP1_N_QUE_DRM	0xfdf0c
 #define MSGQ_AUD_PFDSP1_N_SIZE	20
 #define MSGQ_AUD_PFDSP1_N_NUM	5
 #define MSGQ_AUD_PFDSP1_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_PFDSP1_H_SIZE	0
 #define MSGQ_AUD_PFDSP1_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_PLY_QUE_BLOCK_DRM	0xfe198
-#define MSGQ_AUD_PLY_N_QUE_DRM	0xfe680
+#define MSGQ_AUD_PLY_QUE_BLOCK_DRM	0xfd198
+#define MSGQ_AUD_PLY_N_QUE_DRM	0xfdf70
 #define MSGQ_AUD_PLY_N_SIZE	48
 #define MSGQ_AUD_PLY_N_NUM	5
 #define MSGQ_AUD_PLY_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_PLY_H_SIZE	0
 #define MSGQ_AUD_PLY_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_SFX_QUE_BLOCK_DRM	0xfe1dc
-#define MSGQ_AUD_SFX_N_QUE_DRM	0xfe770
+#define MSGQ_AUD_SFX_QUE_BLOCK_DRM	0xfd1dc
+#define MSGQ_AUD_SFX_N_QUE_DRM	0xfe060
 #define MSGQ_AUD_SFX_N_SIZE	48
 #define MSGQ_AUD_SFX_N_NUM	5
 #define MSGQ_AUD_SFX_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_SFX_H_SIZE	0
 #define MSGQ_AUD_SFX_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_OUTPUT_MIX_QUE_BLOCK_DRM	0xfe220
-#define MSGQ_AUD_OUTPUT_MIX_N_QUE_DRM	0xfe860
+#define MSGQ_AUD_OUTPUT_MIX_QUE_BLOCK_DRM	0xfd220
+#define MSGQ_AUD_OUTPUT_MIX_N_QUE_DRM	0xfe150
 #define MSGQ_AUD_OUTPUT_MIX_N_SIZE	48
 #define MSGQ_AUD_OUTPUT_MIX_N_NUM	8
 #define MSGQ_AUD_OUTPUT_MIX_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_OUTPUT_MIX_H_SIZE	0
 #define MSGQ_AUD_OUTPUT_MIX_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_RND_PLY_QUE_BLOCK_DRM	0xfe264
-#define MSGQ_AUD_RND_PLY_N_QUE_DRM	0xfe9e0
+#define MSGQ_AUD_RND_PLY_QUE_BLOCK_DRM	0xfd264
+#define MSGQ_AUD_RND_PLY_N_QUE_DRM	0xfe2d0
 #define MSGQ_AUD_RND_PLY_N_SIZE	32
 #define MSGQ_AUD_RND_PLY_N_NUM	16
 #define MSGQ_AUD_RND_PLY_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_RND_PLY_H_SIZE	0
 #define MSGQ_AUD_RND_PLY_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_RND_PLY_SYNC_QUE_BLOCK_DRM	0xfe2a8
-#define MSGQ_AUD_RND_PLY_SYNC_N_QUE_DRM	0xfebe0
+#define MSGQ_AUD_RND_PLY_SYNC_QUE_BLOCK_DRM	0xfd2a8
+#define MSGQ_AUD_RND_PLY_SYNC_N_QUE_DRM	0xfe4d0
 #define MSGQ_AUD_RND_PLY_SYNC_N_SIZE	16
 #define MSGQ_AUD_RND_PLY_SYNC_N_NUM	8
 #define MSGQ_AUD_RND_PLY_SYNC_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_RND_PLY_SYNC_H_SIZE	0
 #define MSGQ_AUD_RND_PLY_SYNC_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_RND_SFX_QUE_BLOCK_DRM	0xfe2ec
-#define MSGQ_AUD_RND_SFX_N_QUE_DRM	0xfec60
+#define MSGQ_AUD_RND_SFX_QUE_BLOCK_DRM	0xfd2ec
+#define MSGQ_AUD_RND_SFX_N_QUE_DRM	0xfe550
 #define MSGQ_AUD_RND_SFX_N_SIZE	32
 #define MSGQ_AUD_RND_SFX_N_NUM	16
 #define MSGQ_AUD_RND_SFX_H_QUE_DRM	0xffffffff
 #define MSGQ_AUD_RND_SFX_H_SIZE	0
 #define MSGQ_AUD_RND_SFX_H_NUM	0
 /************************************************************************/
-#define MSGQ_AUD_RND_SFX_SYNC_QUE_BLOCK_DRM	0xfe330
-#define MSGQ_AUD_RND_SFX_SYNC_N_QUE_DRM	0xfee60
+#define MSGQ_AUD_RND_SFX_SYNC_QUE_BLOCK_DRM	0xfd330
+#define MSGQ_AUD_RND_SFX_SYNC_N_QUE_DRM	0xfe750
 #define MSGQ_AUD_RND_SFX_SYNC_N_SIZE	16
 #define MSGQ_AUD_RND_SFX_SYNC_N_NUM	8
 #define MSGQ_AUD_RND_SFX_SYNC_H_QUE_DRM	0xffffffff

diff --git a/examples/audio_player/include/msgq_pool.h b/examples/audio_player/include/msgq_pool.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * audio_player/include/msgq_pool.h
+ * msgq_pool.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *
@@ -41,18 +41,18 @@
 extern const MsgQueDef MsgqPoolDefs[NUM_MSGQ_POOLS] = {
    /* n_drm, n_size, n_num, h_drm, h_size, h_num */
   { 0x00000000, 0, 0, 0x00000000, 0, 0, 0 }, /* MSGQ_NULL */
-  { 0xfe374, 88, 4, 0xffffffff, 0, 0 }, /* MSGQ_AUD_MNG */
-  { 0xfe4d4, 64, 2, 0xffffffff, 0, 0 }, /* MSGQ_AUD_APP */
-  { 0xfe554, 20, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_DSP */
-  { 0xfe5b8, 20, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_PFDSP0 */
-  { 0xfe61c, 20, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_PFDSP1 */
-  { 0xfe680, 48, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_PLY */
-  { 0xfe770, 48, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_SFX */
-  { 0xfe860, 48, 8, 0xffffffff, 0, 0 }, /* MSGQ_AUD_OUTPUT_MIX */
-  { 0xfe9e0, 32, 16, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_PLY */
-  { 0xfebe0, 16, 8, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_PLY_SYNC */
-  { 0xfec60, 32, 16, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_SFX */
-  { 0xfee60, 16, 8, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_SFX_SYNC */
+  { 0xfd374, 88, 30, 0xffffffff, 0, 0 }, /* MSGQ_AUD_MNG */
+  { 0xfddc4, 64, 2, 0xffffffff, 0, 0 }, /* MSGQ_AUD_APP */
+  { 0xfde44, 20, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_DSP */
+  { 0xfdea8, 20, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_PFDSP0 */
+  { 0xfdf0c, 20, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_PFDSP1 */
+  { 0xfdf70, 48, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_PLY */
+  { 0xfe060, 48, 5, 0xffffffff, 0, 0 }, /* MSGQ_AUD_SFX */
+  { 0xfe150, 48, 8, 0xffffffff, 0, 0 }, /* MSGQ_AUD_OUTPUT_MIX */
+  { 0xfe2d0, 32, 16, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_PLY */
+  { 0xfe4d0, 16, 8, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_PLY_SYNC */
+  { 0xfe550, 32, 16, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_SFX */
+  { 0xfe750, 16, 8, 0xffffffff, 0, 0 }, /* MSGQ_AUD_RND_SFX_SYNC */
 };
 
 #endif /* MSGQ_POOL_H_INCLUDED */
diff --git a/examples/audio_player/include/pool_layout.h b/examples/audio_player/include/pool_layout.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * audio_player/include/pool_layout.h
+ * pool_layout.h
  *
  *   Copyright 2018 Sony Semiconductor Solutions Corporation
  *

diff --git a/examples/audio_player_objif/Kconfig b/examples/audio_player_objif/Kconfig
@@ -8,10 +8,38 @@ config EXAMPLES_AUDIO_PLAYER_OBJIF
 	default n
 	depends on CXD56_AUDIO
 	---help---
-		Enable the audio player example
+		Enable the audio player with object level i/f example
 
 if EXAMPLES_AUDIO_PLAYER_OBJIF
 
+choice
+	prompt "Output device selection"
+	default EXAMPLES_AUDIO_PLAYER_OBJIF_OUTPUT_DEV_SPHP
+	---help---
+		Set the device type of output to use
+
+config EXAMPLES_AUDIO_PLAYER_OBJIF_OUTPUT_DEV_SPHP
+	bool "Speaker/Headphone output"
+
+config EXAMPLES_AUDIO_PLAYER_OBJIF_OUTPUT_DEV_I2S
+	bool "I2S output"
+endchoice
+
+choice
+	prompt "player mode selection"
+	default EXAMPLES_AUDIO_PLAYER_OBJIF_MODE_NORMAL
+	---help---
+		Set the operation mode of player capability.
+		To play include Hi-Res file, select Hi-Res mode.
+		If it is not Hi-Res file, select Normal mode.
+
+config EXAMPLES_AUDIO_PLAYER_OBJIF_MODE_NORMAL
+	bool "Normal mode"
+
+config EXAMPLES_AUDIO_PLAYER_OBJIF_MODE_HIRES
+	bool "Hi-Res mode"
+endchoice
+
 config EXAMPLES_AUDIO_PLAYER_OBJIF_PROGNAME
 	string "Program name"
 	default "audio_player_objif"