SAMA5D4-EK NSH: Enable the command line media player in the NSH configuration as well (still does not work, however).

2 files changed, 90 insertions, 7 deletions

diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt
index 2a323a633..2392b4f20 100644
--- a/nuttx/configs/sama5d4-ek/README.txt
+++ b/nuttx/configs/sama5d4-ek/README.txt
@@ -3600,6 +3600,9 @@ Configurations
           LCD/Touchscreen" and also below in this notes.
        d. An LCD/graphics test program.  See the section above entitle
           "TM7000 LCD/Touchscreen" and also below in this notes.
+       e. The NxPlayer command line media player.  This is a work in
+          progress see the "Audio Support" section above and additional
+          notes below.
 
     9. This configuration has support for the FAT, ROMFS, and PROCFS file
        systems built in.
@@ -3848,12 +3851,40 @@ Configurations
        See apps/examples/README.txt for information about configuring these
        examples.
 
-   19. The SAMA5D4-EK includes for an AT25 serial DataFlash.  That support is
+   19. NxPlayer
+
+       This configuration has the command NxPlayer enabled.  That player is still a work in progress and is only tested as of this writing.
+
+       At present, the the WM8904 driver is not included in the
+       configuration.  Instead the "NULL" audio device in built in to
+       support higher level testing (there are also some unresolved I2C
+       communication issues the the current WM8904 driver).
+
+       This configuration depends on media files in the default mountpoint
+       at /mnt/sdard.  You will need to mount the media before running
+       NxPlayer.  Here are the general steps to play a file:
+
+         a. You will need an (full size) SD card containing the .WAV files
+            that you want to play (.WAV is only format supported as of this
+            writing).  That SD card should be inserted in the HSMCI0 media
+            slot A (best done before powering up).
+
+         b. Then from NSH prompt, you need to mount the media volume like:
+
+           nsh> mount -t vfat /dev/mmcsd0 /mnt/sdcard
+
+         c. Then you can run the media player like:
+
+           nsh> nxplayer
+           nxplayer> device pcm0
+           nxplayer> play <filename>
+
+   20. The SAMA5D4-EK includes for an AT25 serial DataFlash.  That support is
        NOT enabled in this configuration.  Support for that serial FLASH could
        be enabled by modifying the NuttX configuration as described above in
        the paragraph entitled "AT25 Serial FLASH".
 
-   20. This example can be configured to exercise the watchdog timer test
+   21. This example can be configured to exercise the watchdog timer test
        (apps/examples/watchdog).  See the detailed configuration settings in
        the section entitled "Watchdog Timer" above.
 
@@ -3982,7 +4013,7 @@ Configurations
 
        This configuration has the media player application enabled.  That
        player is still a work in progress and is only partially integrated
-       with the NxPlay as of this writing.
+       with the NxPlayer as of this writing.
 
        At present, the the WM8904 driver is not included in the
        configuration.  Instead the "NULL" audio device in built in to
diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig
index dcdd5b471..9d797d863 100644
--- a/nuttx/configs/sama5d4-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d4-ek/nsh/defconfig
@@ -290,6 +290,12 @@ CONFIG_SAMA5_EMAC0_ISETH0=y
 # TWI device driver options
 #
 CONFIG_SAMA5_TWI0_FREQUENCY=100000
+# CONFIG_SAMA5_SSC0_RX_RKINPUT is not set
+# CONFIG_SAMA5_SSC0_RX_TXCLK is not set
+# CONFIG_SAMA5_SSC0_RX_MCKDIV is not set
+# CONFIG_SAMA5_SSC0_TX_TKINPUT is not set
+# CONFIG_SAMA5_SSC0_TX_RXCLK is not set
+# CONFIG_SAMA5_SSC0_TX_MCKDIV is not set
 
 #
 # HSMCI device driver options
@@ -530,18 +536,27 @@ CONFIG_I2C_WRITEREAD=y
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_RESET=y
 # CONFIG_SPI is not set
-# CONFIG_I2S is not set
+CONFIG_I2S=y
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
 # CONFIG_RTC_ALARM is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
-# CONFIG_AUDIO_DEVICES is not set
+CONFIG_AUDIO_DEVICES=y
+# CONFIG_AUDIO_I2SCHAR is not set
+# CONFIG_VS1053 is not set
+# CONFIG_AUDIO_WM8904 is not set
+CONFIG_AUDIO_NULL=y
+CONFIG_AUDIO_NULL_MSG_PRIO=1
+CONFIG_AUDIO_NULL_BUFFER_SIZE=8192
+CONFIG_AUDIO_NULL_NUM_BUFFERS=4
+CONFIG_AUDIO_NULL_WORKER_STACKSIZE=768
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 CONFIG_INPUT=y
 # CONFIG_MOUSE is not set
+# CONFIG_INPUT_MAX11802 is not set
 # CONFIG_INPUT_TSC2007 is not set
 # CONFIG_INPUT_ADS7843E is not set
 CONFIG_INPUT_MXT=y
@@ -904,7 +919,33 @@ CONFIG_MM_REGIONS=1
 #
 # Audio Support
 #
-# CONFIG_AUDIO is not set
+CONFIG_AUDIO=y
+# CONFIG_AUDIO_MULTI_SESSION is not set
+# CONFIG_AUDIO_LARGE_BUFFERS is not set
+CONFIG_AUDIO_NUM_BUFFERS=2
+CONFIG_AUDIO_BUFFER_NUMBYTES=8192
+# CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS is not set
+
+#
+# Supported Audio Formats
+#
+# CONFIG_AUDIO_FORMAT_AC3 is not set
+# CONFIG_AUDIO_FORMAT_DTS is not set
+CONFIG_AUDIO_FORMAT_PCM=y
+# CONFIG_AUDIO_FORMAT_MP3 is not set
+# CONFIG_AUDIO_FORMAT_MIDI is not set
+# CONFIG_AUDIO_FORMAT_WMA is not set
+# CONFIG_AUDIO_FORMAT_OGG_VORBIS is not set
+
+#
+# Exclude Specific Audio Features
+#
+# CONFIG_AUDIO_EXCLUDE_VOLUME is not set
+# CONFIG_AUDIO_EXCLUDE_BALANCE is not set
+# CONFIG_AUDIO_EXCLUDE_TONE is not set
+# CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME is not set
+# CONFIG_AUDIO_EXCLUDE_STOP is not set
+# CONFIG_AUDIO_CUSTOM_DEV_PATH is not set
 
 #
 # Binary Formats
@@ -1272,7 +1313,18 @@ CONFIG_I2CTOOL_DEFFREQ=100000
 #
 # NxPlayer media player library / command Line
 #
-# CONFIG_SYSTEM_NXPLAYER is not set
+CONFIG_SYSTEM_NXPLAYER=y
+CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=1500
+CONFIG_NXPLAYER_COMMAND_LINE=y
+CONFIG_NXPLAYER_INCLUDE_HELP=y
+# CONFIG_NXPLAYER_INCLUDE_DEVICE_SEARCH is not set
+CONFIG_NXPLAYER_INCLUDE_PREFERRED_DEVICE=y
+CONFIG_NXPLAYER_FMT_FROM_EXT=y
+# CONFIG_NXPLAYER_FMT_FROM_HEADER is not set
+CONFIG_NXPLAYER_INCLUDE_MEDIADIR=y
+CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sdcard"
+CONFIG_NXPLAYER_RECURSIVE_MEDIA_SEARCH=y
+CONFIG_NXPLAYER_INCLUDE_SYSTEM_RESET=y
 
 #
 # RAM test