Commit Graph
127 Commits
Author SHA1 Message Date
Earle F. Philhower, III 01d9daeb12 Fix ID3v2 decoding, avoid infinite loop
The ID3 reader was incorrectly skipping extended headers and was
cutting off the last 10 bytes of the last ID3 entry. Correct per
http://id3.org specs.

Fixes #41
2018-02-14 20:02:41 -08:00
Earle F. Philhower, III 54498a21a0 Fix overflow for 256x oversampling
Fixes #55
2018-02-08 17:39:51 -08:00
h3ndrik 0bb859037b handle esp32 apll issues (#51)
* make use_apll user-configurable (fixes #37)

* disable apll per default (fixes #47)
2018-02-06 08:06:22 -08:00
Earle F. Philhower, III eb677664f2 Add more default values to I2S output 2018-02-01 12:30:30 -08:00
h3ndrik 4d9d010e8b Fix webradio to use buffer, not raw input streams
Thanks to @h3ndrik, again.
2018-01-31 19:20:08 -08:00
h3ndrik 05a78dce2a Make stream reads orders of magnitude faster (fixes #38) (#44)
Fix by @h3ndrik 
* Use correct read for stream data on the ESP32 (fixes #38)
* Adjust types for read()
2018-01-31 19:18:35 -08:00
h3ndrik e7c2aba2aa don't use audio pll on buggy rev0 chips (#40)
as ESP32_MP3_Decoder does
2018-01-26 07:51:49 -08:00
h3ndrik f1916051ec initialize member variables (#39)
if AudioOutputI2S is instanciated in a function (like in the examples) the member variables are not initialized to a default value.
2018-01-26 07:50:43 -08:00
Earle F. Philhower, III b9f13a3161 Enable onboard DAC output 2018-01-25 20:52:58 -08:00
Earle F. Philhower, III 96fc37dce5 Refactor I2S to be cleaner, more extensible
With the multiple I2S modes on the ESP32, it makes sense to use a
cleaner class hierarchy for the I2S tools.  Make I2SNoDAC into a
subclass of I2S (renamed from I2SDAC) and remove about 80% of the
code which was identical exept for the per-sample bitstream synthesis.
2018-01-25 19:15:02 -08:00
Earle F. Philhower, III 7a7f8bf449 Use a single hardcoded I2S config, tested working
Tested working i2s config for both I2S and I2SNoDac, only have the
one copy for later refactor into optional configuration.
2018-01-24 13:44:43 -08:00
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 93f7d90baf Update WebRadio to use prealloc'd buffers
To avoid allocations in the application, preallocate all decoder and
buffer memory in and then never free it.  Use the new pre-alloc'd
constructors to generate the playback objects.
2018-01-21 15:07:40 -08:00
Earle F. Philhower, III 22c80beb8f Merge branch 'master' of https://github.com/earlephilhower/ESP8266Audio 2018-01-21 13:08:25 -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 786354e678 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 20:56:05 -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 4b3ca23d6e Include ID3 tag scanner in MP3 test 2018-01-20 08:42:51 -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 e5d23a4692 Enable Travis-CI builds
Enable automatic building of all examples and SAM(speech) on a
commit by using Travis-CI.  Build against ESP8266 and ESP32.

Minor tweaks to examples and codebase to allow successful compilation
on ESP32 compiler.
2018-01-19 15:57:30 -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 94a3f9ab91 Remove hostname setting for ESP32 compatability
The examples were setting a hostname for the WiFi connection, but this is
done via a different call on the ESP32 vs. the ESP8266.  To avoid #ifdef
explosion, simply remove the call as it's unneeded anyway.

Thanks to @reaper7 for reporting this in pull #33.
2018-01-18 10:57:02 -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 bd40d8af6f Include info on using BCLK/LRCLK as inputs w/SWDAC
The bit clock and l/r clock can be used as inputs, per issue #32 testing.
Explain how to do this in the readme.
2018-01-18 10:15:02 -08:00
Earle F. Philhower, III ddf4db187c Update to include 2.4 release + ESP32 support 2018-01-18 10:09:25 -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 2e348d2b1f Redirect to original SPIRAM library
Change from my own patched copy of SPIRAM libs to the original source
since the required patches were just commited.
2018-01-04 10:01:50 -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 d06dcf1123 Include type and volume in checksum, cleanup code 2017-12-24 09:31:36 -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 e844536251 Fix the URL max limit in web interface
The web interface has a hardcoded 64 char URL limit, even though the
actual url[] array was increased to 96 chars.  Use sizeof(url) in the
handler instead of a hardcoded number to enable use of all space.
Addresses issue #21 , again.
2017-12-22 21:39:13 -08:00
Earle F. Philhower, III 4cb8861070 Fix PROGMEM string accesses in callbacks
The MD and STATUS callbacks can be passed PROGMEM strings, so be sure to
use proper strcpy_p()s to move them to RAM before printing to avoid crashes.
Found during debug of issue #21 .
2017-12-22 21:28:28 -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 8c7b30add3 Update to include the 2.4.0-rc2 JSON link 2017-12-16 16:17:47 -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 397aee8c19 Actually change volume in the HandleVolue callback 2017-12-15 22:18:23 -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 0f0b6cd664 Fix EEPROM save/load and corruption on restart
EEPROM saving was not calculating the correct checksum because it was
not clearing memory before writing.  Fix that so it automatically will
restart the connection on a reset.

There was a fatal corruption caused by improper delete'ing of objects
without clearing their pointers when the initial connection to a stream
failed.  Refactor to use the proper StopPlaying() routine.

Extend the URL to 96 characters.  We not have enough memory to do so!
2017-12-15 19:03:03 -08:00