Commit Graph
79 Commits
Author SHA1 Message Date
Earle F. Philhower, III e8e7acb884 Fix warnings and off-by-one in AAC 2018-01-21 19:27:07 -08:00
Earle F. Philhower, III 8ffebe6496 Enable static allocated buffers, no dynamic malloc
Because we are allocating objects totaling over 80% of the ESP8266 memory
space, we are very sensitive to memory fragmentation.  While we can control
our own allocs, the IP and SDK can allocate any size, at any time, which
can cause us to not be able to find the large contiguous memory areas we need
for the codes.

Work around this by preallocating, before anything else, buffer memory and
never freeing it.  Pass this memory into the codec and it will allocate from
this block and be guaranteed to always succeed.

This may fix the last of the hangs on the webradio/http streaming, which only
seemed to happen after a stop/start cycle.
2018-01-21 13:02:05 -08:00
Earle F. Philhower, III d04beb1105 More paranoid input checks, random error injection
Check for NULL input data buffers and set values to NULL after freeing()
local variables to avoid memory corruption on use-after-freee.

Add lots of error injection in the host testing to help find bugs on
the PC where they're easier to debug.
2018-01-20 21:08:13 -08:00
Earle F. Philhower, III f16cd2b269 Only mad_*_finish after a successful mad_*_start
When the input file(stream) doesn't open, you could end up calling
mp3::stop() which would try and mad_finish structures that were
not yet initialized.  Now carry a flag when these are set, and only
_finish when it's set.
2018-01-20 18:32:21 -08:00
Earle F. Philhower, III a359222eae Fix double close in ID3 routine, add buff to tests 2018-01-20 09:24:10 -08:00
Earle F. Philhower, III 68e557fdaa Remove ESP8266 compile warning in layer3.c 2018-01-19 22:28:00 -08:00
Earle F. Philhower, III 24e9d0a585 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.
2018-01-19 22:11:52 -08:00
Earle F. Philhower, III 07dee61fbf Merge branch 'hosttests' 2018-01-19 21:25:34 -08:00
Earle F. Philhower, III 0172f17b51 MP3 test in Valgrind
Run a host MP3 test using valgrind, shows no errors.
2018-01-19 21:23:17 -08:00
Earle F. Philhower, III da068e30e6 Ensure BPS=16 is set in MP3 decoder
Valgrind found another uninitialized use.  BitsPerSample was not being
called by the LIBMAD decoder, so it was possible to start out in a bad
state.  Now always set it to 16, the decoder native output size.

Channels are initialized to 2, but this setting is always reset on
a per-frame basis anyway.
2018-01-19 21:09:37 -08:00
Earle F. Philhower, III 158fe23181 Don't crash on an invalid (layer I or II) frame
We removed the MP2-layer I and II decoders to save space, but an occasional
bad frame can come in that, by random chance, specifies one of this type.
Was calling NULL because of that.  Now, just skip the frame and no crash.
2018-01-19 20:40:00 -08:00
Earle F. Philhower, III cffb424c2c WIP - build some code on the PC to run valgrind/etc. 2018-01-19 19:39:19 -08:00
Earle F. Philhower, III 5986831bd6 Fix I2S helpers to send/nonblock properly
The original I2S setup had the wrong # of bits being sent to the DAC
as well as wrong timeouts specified on the write_sample wrappers.
Fix those, allowing things like WebRadio.ino to work.
2018-01-19 10:01:43 -08:00
Earle F. Philhower, III 244007b0c5 Enable AAC-SBR on ESP-32, there's enough RAM
AAC-SBR allows for lower bitrates to have higher quality audio output,
and is used by many web radio stations.  It was disables on the ESP8266
due to RAM limitations (about 50KB too little), but the ESP32 has no
such problem.  Enable it automatically during compile.
2018-01-18 10:53:03 -08:00
Earle F. Philhower, III e84123e03d Clean up ESP32 compile warnings, use audio PLL
Remove a couple compiler warnings found when building for the ESP32.

Enable the high-precision audio PLL as clock source on ESP32.
2018-01-18 10:01:32 -08:00
tueddy 03aa2467f0 Porting for ESP-32 (#33)
* support ESP-32
* make compile with ESP-32/arduino platform
* fixed: use libmad on ESP8266 as original
2018-01-18 08:55:03 -08:00
Earle F. Philhower, III 0c002cd014 Obey data size field, avoid WAV clicks w/metadata
The DATA chunk has a size field that was ignored.  When there was additional
metadata after the chunk, however, it would try and play it leading to
clicks.  Store and only read that amount of data now.
2018-01-10 08:04:39 -08:00
Earle F. Philhower, III 6b30ed77f5 Fix infinite loop on EOF in SPI buffer
Emil Plalan found and fixed a bug where the buffer refill would loop
forever (until WDT) when there was no more data to read.  For web streams
this wasn't detected, since there isn't really an EOF.  However, single
files streamed from a web server would have this problem.
2018-01-04 09:46:16 -08:00
Earle F. Philhower, III 2d25b16f09 Preallocate all memory and move imdct_s to progmem
Because the mp3 player is a long living object and needs to allocate
large contiguous chunks on each frame, it is safer to allocate the
large xr[] and tmp[] arrays at the beginning.  Add them to the frame
structure which lives the entire time the mp3 object is alive.  No
heap allocations are now used by the mp3 player.

Move the imdct_s[] array to progmem, but do a memcpy_P() to stack
as the macros may cause a 16-bit access after optimization.  It's only
36 words long and each data is read, anyway, so this doesn't increase
the CPU work significantly.
2018-01-01 11:41:31 -08:00
Earle F. Philhower, III 025edf0d81 Clean up DecodeNextFrame path to something sane
As seen in issue #21, the MP3 decoder would barf on a single lost sync
error, even though it was not actually a fatel error.

Rewrote the logic to include another Input() on DNF failure, and only die
when Input() actually fails.  Seems to fix the problem in issue #21 and also
did not break the WebRadio.
2017-12-24 09:20:01 -08:00
Earle F. Philhower, III 6c3064a4b5 Remove infinite loop on error in DecodeNextFrame
DecodeNextFrame had a leftover while(1) in the inner loop without any
additional Input() calls, which could lead to an infinite loop on an
error condition.  Remove that unneeded loop.  Addresses some of the
stuff found in issue #21
2017-12-22 21:19:06 -08:00
Earle F. Philhower, III e4c1c8fc66 Fix ID3V2.2 decoding, non-unsync handling
Add handing of ID3V2.2.x (tested) and (I think) V2.3.x, and fix the
unsync handling.

Issue 23 found a problem where ID3V2.2 headers, which are very different
from v2.3 and v2.4, caused crashes.  Fixing that showed another bug where
the unsyunc flag was not honored and all data was assumed to be unsync'd
causing improper reads of ID3 tags in some circumstances.
2017-12-22 20:20:46 -08:00
Earle F. Philhower, III 5b45a79cf7 Fix ICY decoder overflow causing streams to die 2017-12-16 16:16:01 -08:00
Earle F. Philhower, III 5a9340c452 Fix ICY decoding when apostrophes encountered
The ICYMDReader was not properly returning the unread "'" characters
and so StreamTitles were being truncated at the first apostrophe.  Fix
the unread() and read() member functions to clean up.
2017-12-15 19:49:37 -08:00
Earle F. Philhower, III 8e94702468 Replace Stream with simple string in MD callback
@armSeb found that the stream interface caused a big slowdown and
hiccups in his playback, replace the MetadataCallback's *Stream with
a simple *char for faster operation and less overhead.
2017-12-15 12:54:49 -08:00
Earle F. Philhower, III d923ebef36 Move the callback constant strings to PMEM 2017-12-15 12:03:05 -08:00
Earle F. Philhower, III 634d0b8d02 Store AAC/MP3 flag in EEPROM for WebRadio 2017-12-15 10:31:19 -08:00
Earle F. Philhower, III 8d401a4a39 Move strings to PROGMEM, save a few heap bytes 2017-12-14 10:50:55 -08:00
Earle F. Philhower, III cce9ceaffd Try and allocate inner loop mem on stack
Check the available stack space, and if large enough use a stack
variable for the inner loop.  If not, fall back to heap allocation.
2017-12-12 16:57:20 -08:00
Earle F. Philhower, III f2550b0ab1 Remove debugging stack() calls 2017-12-12 14:04:13 -08:00
Earle F. Philhower, III 23a8ed8724 Add HELIX MP3 decoder initial revision
Include the RealNetworks HELIX MP3 decoder as AudioGeneratorMP3a.
Right now runs fine, but requires a full 1152*2 sample buffer and
seems to run slower than real time.
2017-12-08 19:58:45 -08:00
Earle F. Philhower, III 8893ced2af Add WebRadio example, a web page controller
Simple example web interface to the player.  Can change the volume and
the station through a slider and menu box.
2017-12-08 13:07:59 -08:00
Earle F. Philhower, III 1690289714 Rationalize the MP3 generation loop
Remove the inInnerDecode flag in the main generation loop and make the
render path more readable in the MP3 decoder object.
2017-12-08 07:16:01 -08:00
Earle F. Philhower, III 9c120a777a Add callbacks for metadata and status reports
All objects can have a metadata and/or status report callback once created.
They will call the source program with the parsed ID3 tag, ICY StreamTitle,
or text and numeric error ID of any interesting event.  It is up to the end
application to figure out what to do with this.  Normally, you'd just print
it to the LCD or Serial port.  But it is possible to detect, say, a buffer
overflow and then switch to a lower bitrate stream for example.
2017-12-06 21:11:23 -08:00
armSeb 97c05c9f34 SPIRAM buffer support from @armSeb
* Initial SPIRAM buffering support

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* SPI RAM Buffering fill & read.

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* First "working" version...

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Improved version of SPIRAM buffering

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Fixed spiram.h path

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Buffer fill optimization

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Modified read block min to avoid too little buffering attempts

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Temps buffer size decrease from 2048 to 1600 Bytes

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Decrease the temp buffer to 256Bytes

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Local buffer variable

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Added loop function to SPIRAMBuffer that refill it automatically

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Compile issue

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Add possibility to define Chip Select pin from Sketch

Signed-off-by: Sebastien Decourriere <sebtx452@gmail.com>

* Externalize libspiram

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Copyright fix

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Deleted embedded libspiram

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Added comments, example and keyword

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* README modification

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Correction

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* Schema example

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>

* README correction

Signed-off-by: sebastien <armseb@MacBook-de-sebastien.local>
2017-12-06 13:30:51 -08:00
Earle F. Philhower, III 3226d6ec0a Add metadta callback for Icy streams
Allow a UI to get a notification when a StreamTitle or other metadata
comes into the stream. Callback function would normally just update a
flag and let the next global event loop handle updating the display.
2017-12-04 12:45:16 -08:00
Earle F. Philhower, III 8c6bb549f1 Fix crash on ::loop in MIDI generator
Forgot to save the passed in *AudioFileSource, since it was not needed
in the MIDI playback engine (it's encapsulated in a buffered object).  Now
with ::loop in every object, it's needed and we were calling a garbage
object causing a random crash.
2017-12-04 10:51:20 -08:00
Earle F. Philhower, III 75268b5e3b Add inline ID3 decoder w/callback interface
ID3 tags can now automatically give your app a callback with different tag
types without any additional work on your application.  See the PlayMP3 example
for a very simple example of AudioFileSourceID3's use.
2017-12-02 13:01:46 -08:00
Earle F. Philhower, III fece88a9be Add loop method to all input and outputs
Adds a virtual loop() method to the file input and audio output objects.
By default does nothing, but it can be used to prefill buffers/etc. in the
case of a buffered input, or to update a volume meter on an output, etc.

The AudioGenerators all now call it as part of their own loop()s, so there
is no user intervention required to make it work.

Thanks to @armSeb for the idea with his SPI RAM code.
2017-11-24 10:35:20 -08:00
Earle F. Philhower, III 373b4ef6ff Move a few small tables into PROGMEM
No reason not to save a few bytes of RAM by moving some char[] to PROGMEM.
2017-11-23 19:31:39 -08:00
Earle F. Philhower, III 1875683ce1 Add SBR code back in, but disable for now.
The SBR code compiles, but it requires an additional 50,788 bytes of system
RAM to run so it's not going to work on the ESP8266.  Add the code in just in
case someone wants to move it to another architecture w/more RAM available.
2017-11-23 19:04:30 -08:00
Earle F. Philhower, III 432f892d70 Add retry logic to HTTP Streams
On a 0-byte read or a disconnect, optionally automatically reconnect
up to a user specified number of tries with a delay between each attempt.
2017-11-22 07:20:42 -08:00
Earle F. Philhower, III 2737dec473 Fix block corruption when hitting an ICY block
Wasn't incrementing the returned data pointer when we had to split the
requested read into pre- and post-ICY blocks.  This resulted in errors
in the decoded stream.
2017-11-21 20:09:37 -08:00
Earle F. Philhower, III 4b2bbe7ad5 Preliminary ICY HTTP stream support
Add a subclass of the HTTPStream that can extract the ICY metadata.
Needs to implement a callback function or parse it internally and expose
a class variable to let the UI see the current stream information.
2017-11-21 11:55:23 -08:00
Earle F. Philhower, III 64032d8f43 Force refill of buffer when emptied completely
@armSeb founf another case in issue #9 where the buffer would never
refill if the input stream was very slightly below the output stream
velocity.  In that case, when we hit a 0-water mark, force a complete
refill of the buffer on the next pass.
2017-11-21 08:36:17 -08:00
Earle F. Philhower, III fad8af052f Reduce default MP3 buffer to max frame size + fluff
MP3 maximum frame size of 1441 bytes, and now that there is a real
buffering class available it makes no sense to include additional space
in ths decoder.  Reduce to the minimum to save memory in default case.
2017-11-21 08:11:05 -08:00
Earle F. Philhower, III 09b8079ef7 Add FIR and decimation filter for frequency xvert
A simple FIR filter with decimation and specifable taps and rational
decimation allows for frequency conversion or any other kind of filtering
desired.
2017-11-21 07:45:02 -08:00
Earle F. Philhower, III 9c3f579c96 Add buffering to MP3 streaming
The buffer class seems to work very well to avoid hiccups while
streaming from the web, so add it by default to the example to
make it easier for users to cut-n-paste and make it work.
2017-11-20 12:15:32 -08:00
Earle F. Philhower, III 860c6678ab Fix noise during amplification
@armSeb, in issue 7, noticed noise being introduced when amplifying the
output.  By moving the amplification to right before submitting the sample
to I2S it went away.  Update with his suggested fix.
2017-11-20 07:04:11 -08:00
Earle F. Philhower, III 8a19c9c093 Fix buffering losing bytes
Correct issue @armSeb found and fixed where some bytes on the fallthrough
case were not being recorded as stored, leading to mp3 playback errors.
Fixes one half of issue 7.
2017-11-20 06:59:57 -08:00