You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/06/02 07:27:46 UTC
[incubator-nuttx] branch master updated (4d49210 -> 57d823b)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 4d49210 binfmt: Introduce a separate text memory for ELF
new ac32d1a libs/libc/audio/libsrc: update header location
new 57d823b pcm_decode: correction to RAW format support
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
audio/pcm_decode.c | 6 ++++--
libs/libc/audio/libsrc/Make.defs | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
[incubator-nuttx] 01/02: libs/libc/audio/libsrc: update header
location
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ac32d1a68e65125591241494cb64e02d18e181bf
Author: tobias2johansson <to...@sony.com>
AuthorDate: Fri May 28 09:09:12 2021 +0200
libs/libc/audio/libsrc: update header location
update Make.defs with the correct path to the library header and
make sure it can be found
---
libs/libc/audio/libsrc/Make.defs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libs/libc/audio/libsrc/Make.defs b/libs/libc/audio/libsrc/Make.defs
index 63dda0e..78d956b 100644
--- a/libs/libc/audio/libsrc/Make.defs
+++ b/libs/libc/audio/libsrc/Make.defs
@@ -27,7 +27,7 @@ libsamplerate:
$(Q) curl -L https://codeload.github.com/libsndfile/libsamplerate/zip/master -o libsamplerate.zip
$(Q) unzip -o libsamplerate.zip
$(Q) mv libsamplerate-master libsamplerate
- $(Q) cp -rf libsamplerate/src/samplerate.h $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)audio$(DELIM)
+ $(Q) cp -rf libsamplerate/include/samplerate.h $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)audio$(DELIM)
context:: libsamplerate
@@ -38,6 +38,8 @@ CSRCS += src_zoh.c
CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\"
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)audio}
+
ifeq ($(CONFIG_SINC_FAST_CONVERTER),y)
CFLAGS += -DENABLE_SINC_FAST_CONVERTER
endif
[incubator-nuttx] 02/02: pcm_decode: correction to RAW format
support
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 57d823b69d6193fbb68afab400fbf1bc30a6c32c
Author: tobias2johansson <to...@sony.com>
AuthorDate: Fri May 28 08:52:28 2021 +0200
pcm_decode: correction to RAW format support
corrects misplaced preprocessor directives for CONFIG_AUDIO_FORMAT_RAW
---
audio/pcm_decode.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/audio/pcm_decode.c b/audio/pcm_decode.c
index 69530f1..15a4116 100644
--- a/audio/pcm_decode.c
+++ b/audio/pcm_decode.c
@@ -1182,14 +1182,16 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
priv->export.upper(priv->export.priv, AUDIO_CALLBACK_COMPLETE,
NULL, OK);
#endif
- }
#ifndef CONFIG_AUDIO_FORMAT_RAW
+ }
+
/* This is not a WAV file! */
auderr("ERROR: Invalid PCM WAV file\n");
- return -EINVAL;
#endif
+
+ return -EINVAL;
}
/****************************************************************************