This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git

commit 4be56a0036eeaa6412ff8e9c4de918b4da7e5b2b
Author: zhaozhenghang <[email protected]>
AuthorDate: Thu Nov 12 09:45:21 2026 +0800

    system/nxplayer: support 32-bit chmap
    
    Widen the chmap parameter of nxplayer_playraw() to uint32_t and parse
    it with strtoul in the playraw command so hex values are accepted.
    
    Signed-off-by: zhaozhenghang <[email protected]>
---
 include/system/nxplayer.h       |  2 +-
 system/nxplayer/nxplayer.c      |  8 ++++----
 system/nxplayer/nxplayer_main.c | 11 +++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/system/nxplayer.h b/include/system/nxplayer.h
index d2c7f7761..6fa1a1981 100644
--- a/include/system/nxplayer.h
+++ b/include/system/nxplayer.h
@@ -252,7 +252,7 @@ int nxplayer_playfile(FAR struct nxplayer_s *pplayer,
 int nxplayer_playraw(FAR struct nxplayer_s *pplayer,
                      FAR const char *filename,
                      int filefmt, int subfmt, uint8_t nchannels,
-                     uint8_t bpsamp, uint32_t samprate, uint8_t chmap);
+                     uint8_t bpsamp, uint32_t samprate, uint32_t chmap);
 
 /****************************************************************************
  * Name: nxplayer_playtone
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index cfe8fcdf3..afe52822c 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -105,7 +105,7 @@ static int nxplayer_playfile_impl(FAR struct nxplayer_s 
*pplayer,
                                   FAR const char *pfilename, int filefmt,
                                   int subfmt, uint8_t nchannels,
                                   uint8_t bpsamp, uint32_t samprate,
-                                  uint8_t chmap, bool file_playback);
+                                  uint32_t chmap, bool file_playback);
 
 #ifdef CONFIG_NXPLAYER_FMT_FROM_EXT
 static const struct nxplayer_ext_fmt_s g_known_ext[] =
@@ -1877,7 +1877,7 @@ int nxplayer_stop(FAR struct nxplayer_s *pplayer)
 static int nxplayer_playinternal(FAR struct nxplayer_s *pplayer,
                                  int filefmt, int subfmt,
                                  uint8_t nchannels, uint8_t bpsamp,
-                                 uint32_t samprate, uint8_t chmap)
+                                 uint32_t samprate, uint32_t chmap)
 {
   struct mq_attr      attr;
   struct sched_param  sparam;
@@ -2196,7 +2196,7 @@ static int nxplayer_playfile_impl(FAR struct nxplayer_s 
*pplayer,
                                   FAR const char *pfilename,
                                   int filefmt, int subfmt,
                                   uint8_t nchannels, uint8_t bpsamp,
-                                  uint32_t samprate, uint8_t chmap,
+                                  uint32_t samprate, uint32_t chmap,
                                   bool file_playback)
 {
 #ifdef CONFIG_NXPLAYER_INCLUDE_MEDIADIR
@@ -2442,7 +2442,7 @@ err_out:
 int nxplayer_playraw(FAR struct nxplayer_s *pplayer,
                      FAR const char *pfilename,
                      int filefmt, int subfmt, uint8_t nchannels,
-                     uint8_t bpsamp, uint32_t samprate, uint8_t chmap)
+                     uint8_t bpsamp, uint32_t samprate, uint32_t chmap)
 {
   return nxplayer_playfile_impl(pplayer, pfilename, filefmt, subfmt,
                                 nchannels, bpsamp, samprate, chmap, false);
diff --git a/system/nxplayer/nxplayer_main.c b/system/nxplayer/nxplayer_main.c
index cb5659778..af2705388 100644
--- a/system/nxplayer/nxplayer_main.c
+++ b/system/nxplayer/nxplayer_main.c
@@ -319,7 +319,7 @@ static int nxplayer_cmd_playraw(FAR struct nxplayer_s 
*pplayer, char *parg)
   int channels = 0;
   int bpsamp = 0;
   int samprate = 0;
-  int chmap = 0;
+  char chmap[16] = "";
   size_t len;
   char filename[PATH_MAX];
 
@@ -333,13 +333,16 @@ static int nxplayer_cmd_playraw(FAR struct nxplayer_s 
*pplayer, char *parg)
   memcpy(filename, parg, len);
   filename[len] = '\0';
 
-  sscanf(parg + len, "%d %d %d %d", &channels, &bpsamp,
-         &samprate, &chmap);
+  /* chmap is read as text so that hex masks and bit 31 both fit */
+
+  sscanf(parg + len, "%d %d %d %15s", &channels, &bpsamp,
+         &samprate, chmap);
 
   /* Try to play the file specified */
 
   ret = nxplayer_playraw(pplayer, filename, AUDIO_FMT_PCM, 0,
-                         channels, bpsamp, samprate, chmap);
+                         channels, bpsamp, samprate,
+                         strtoul(chmap, NULL, 0));
 
   /* nxplayer_playraw returned values:
    *

Reply via email to