Add AAC valgrind test on the host, clean up warns

The AAC codec didn't show any issues on initial valgrind runs except
for having a different stop() behavior than the MP3 one.  Make them
match.
This commit is contained in:
Earle F. Philhower, III committed 2018-01-19 22:11:52 -08:00
1 parent 07dee61fbf
commit 24e9d0a585
6 files changed
+60 -6

No files matched your search

+1 -1
View File
@@ -50,8 +50,8 @@ AudioGeneratorAAC::~AudioGeneratorAAC()
bool AudioGeneratorAAC::stop()
{
if (!running) return true;
running = false;
output->stop();
return file->close();
}
+1 -1
View File
@@ -50,7 +50,7 @@
#include <pgmspace.h>
// Can't fit in ESP8266 RAM
#ifdef ESP32
#ifndef ESP8266
#define AAC_ENABLE_SBR 1
#endif
+2
View File
@@ -74,7 +74,9 @@
#error No platform defined. See valid options in aacdec.h
#endif
#ifndef USE_DEFAULT_STDLIB
#define USE_DEFAULT_STDLIB
#endif
#ifdef __cplusplus
extern "C" {
+24
View File
@@ -606,4 +606,28 @@ clip to [-2^n, 2^n-1], valid range of n = [1, 30]
#endif /* platforms */
#ifndef CLIP_2N
#define CLIP_2N(y, n) { \
int sign = (y) >> 31; \
if (sign != (y) >> (n)) { \
(y) = sign ^ ((1 << (n)) - 1); \
} \
}
#endif
#ifndef CLIP_2N_SHIFT
/* From coder.h, ORIGINAL:
do y <<= n, clipping to range [-2^30, 2^30 - 1] (i.e. output has one guard bit)
*/
//TODO (FB) Is there a better way ?
#define CLIP_2N_SHIFT(y, n) { \
int sign = (y) >> 31; \
if (sign != (y) >> (30 - (n))) { \
(y) = sign ^ (0x3fffffff); \
} else { \
(y) = (y) << (n); \
} \
}
#endif
#endif /* _ASSEMBLY_H */
+10 -4
View File
@@ -1,4 +1,4 @@
all: mp3
all: mp3 aac
libmad=../../src/libmad/decoder.c ../../src/libmad/frame.c ../../src/libmad/bit.c ../../src/libmad/stream.c ../../src/libmad/fixed.c \
../../src/libmad/timer.c ../../src/libmad/layer3.c ../../src/libmad/synth.c ../../src/libmad/huffman.c ../../src/libmad/version.c
@@ -36,10 +36,16 @@ mp3: FORCE
gcc $(CCOPTS) -c $(libmad) -I ../../src/ -I.
g++ $(CPPOPTS) -o mp3 mp3.cpp Serial.cpp *.o ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioFileSourceID3.cpp ../../src/AudioGeneratorMP3.cpp -I ../../src/ -I.
rm -f *.o
valgrind --leak-check=full --track-origins=yes -v --error-limit=no --show-leak-kinds=all ./mp3
echo valgrind --leak-check=full --track-origins=yes -v --error-limit=no --show-leak-kinds=all ./mp3
aac: FORCE
rm -f *.o
gcc $(CCOPTS) -DUSE_DEFAULT_STDLIB -c $(libhelix_aac) -I ../../src/ -I.
g++ $(CPPOPTS) -o aac aac.cpp Serial.cpp *.o ../../src/AudioFileSourceSTDIO.cpp ../../src/AudioOutputSTDIO.cpp ../../src/AudioFileSourceID3.cpp ../../src/AudioGeneratorAAC.cpp -I ../../src/ -I.
rm -f *.o
echo valgrind --leak-check=full --track-origins=yes -v --error-limit=no --show-leak-kinds=all ./aac
clean:
rm -f mp3 *.o
rm -f mp3 aac *.o
FORCE:
+22
View File
@@ -0,0 +1,22 @@
#include <Arduino.h>
#include "AudioFileSourceSTDIO.h"
#include "AudioOutputSTDIO.h"
#include "AudioGeneratorAAC.h"
int main(int argc, char **argv)
{
(void) argc;
(void) argv;
AudioFileSourceSTDIO *in = new AudioFileSourceSTDIO("jamonit.aac");
AudioOutputSTDIO *out = new AudioOutputSTDIO();
out->SetFilename("jamonit.aac.wav");
AudioGeneratorAAC *aac = new AudioGeneratorAAC();
aac->begin(in, out);
while (aac->loop()) { /*noop*/ }
aac->stop();
delete aac;
delete out;
delete in;
}