commit 56847632bc2fd39a8fff68fa1e883f06310c876a
author Glenn Kasten <gkasten@google.com> Tue Oct 30 16:07:50 2012 -0700
committer Glenn Kasten <gkasten@google.com> Wed Oct 31 11:22:55 2012 -0700
tree 7d6d509d807672c8c9454d57d586d33b915ae96c
parent 4fbe4c710dcf0f421cf01e4c63268ae4608b6f15

Use tinysndfile

Change-Id: I6f94fed488662a93e778ea64b8e4861dce528f26

tests/sandbox/Android.mk

diff --git a/tests/sandbox/Android.mk b/tests/sandbox/Android.mk
index 4f39385..929c364 100644
--- a/tests/sandbox/Android.mk
+++ b/tests/sandbox/Android.mk
@@ -322,7 +322,8 @@
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_C_INCLUDES:= \
-	$(call include-path-for, wilhelm)
+	$(call include-path-for, wilhelm) \
+	$(call include-path-for, audio-utils)
 
 LOCAL_SRC_FILES:= \
 	playbq.c
@@ -343,8 +344,7 @@
 
 LOCAL_MODULE:= slesTest_playbq
 
-# commented out because libsndfile is not yet standard
-#include $(BUILD_EXECUTABLE)
+include $(BUILD_EXECUTABLE)
 
 # monkey
 

tests/sandbox/playbq.c

diff --git a/tests/sandbox/playbq.c b/tests/sandbox/playbq.c
index 68e236a..e1a7639 100644
--- a/tests/sandbox/playbq.c
+++ b/tests/sandbox/playbq.c
@@ -26,7 +26,7 @@
 
 #include <SLES/OpenSLES.h>
 #ifdef ANDROID
-#include "sndfile.h"
+#include <audio_utils/sndfile.h>
 #else
 #include <sndfile.h>
 #endif
@@ -225,9 +225,6 @@
     switch (sfinfo.format & SF_FORMAT_SUBMASK) {
     case SF_FORMAT_PCM_16:
     case SF_FORMAT_PCM_U8:
-    case SF_FORMAT_ULAW:
-    case SF_FORMAT_ALAW:
-    case SF_FORMAT_IMA_ADPCM:
         break;
     default:
         fprintf(stderr, "unsupported sub-format 0x%x\n", sfinfo.format & SF_FORMAT_SUBMASK);