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.
This commit is contained in:
Earle F. Philhower, III committed 2017-11-21 11:55:23 -08:00
1 parent 64032d8f43
commit 4b2bbe7ad5
4 files changed
+189 -2

No files matched your search

+130
View File
@@ -0,0 +1,130 @@
/*
AudioFileSourceICYStream
Streaming Shoutcast ICY source
Copyright (C) 2017 Earle F. Philhower, III
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "AudioFileSourceICYStream.h"
AudioFileSourceICYStream::AudioFileSourceICYStream()
{
pos = 0;
reconnect = false;
saveURL = NULL;
}
AudioFileSourceICYStream::AudioFileSourceICYStream(const char *url)
{
saveURL = NULL;
reconnect = false;
open(url);
}
bool AudioFileSourceICYStream::open(const char *url)
{
static const char *hdr[] = { "icy-metaint" };
pos = 0;
http.begin(url);
http.addHeader("Icy-MetaData", "1");
http.collectHeaders( hdr, 1 );
http.setReuse(true);
int code = http.GET();
if (code != HTTP_CODE_OK) {
http.end();
return false;
}
if (http.hasHeader(hdr[0])) {
String ret = http.header(hdr[0]);
icyMetaInt = ret.toInt();
Serial.printf("ICY metaint = %d\n", icyMetaInt);
} else {
icyMetaInt = 0;
}
icyByteCount = 0;
size = http.getSize();
Serial.printf("Stream size: %d\n", size);
free(saveURL);
saveURL = strdup(url);
return true;
}
AudioFileSourceICYStream::~AudioFileSourceICYStream()
{
http.end();
}
uint32_t AudioFileSourceICYStream::readInternal(void *data, uint32_t len, bool nonBlock)
{
if (!http.connected()) {
Serial.println("Stream disconnected\n");
Serial.flush();
http.end();
if (reconnect) {
if (!open(saveURL)) {
return 0;
} else {
Serial.println("Reconnected to stream");
}
} else {
return 0;
}
}
if ((size>0) && (pos >= size)) return 0;
WiFiClient *stream = http.getStreamPtr();
// Can't read past EOF...
if ( (size > 0) && (len > (uint32_t)(pos - size)) ) len = pos - size;
if (!nonBlock) {
int start = millis();
while ((stream->available() < (int)len) && (millis() - start < 500)) yield();
}
size_t avail = stream->available();
if (!avail) return 0;
if (avail < len) len = avail;
int read = 0;
// If the read would hit an ICY block, split it up...
if (((int)(icyByteCount + len) > (int)icyMetaInt) && (icyMetaInt > 0)) {
int beforeIcy = icyMetaInt - icyByteCount;
int ret = stream->readBytes(reinterpret_cast<uint8_t*>(data), beforeIcy);
read += ret;
pos += ret;
len -= ret;
icyByteCount += ret;
uint8_t mdSize;
int mdret = stream->readBytes(&mdSize, 1);
if ((mdret == 1) && (mdSize > 0)) {
char *mdBuff = (char*)malloc(mdSize * 16);
mdret = stream->readBytes(reinterpret_cast<uint8_t*>(mdBuff), mdSize * 16);
if (mdret == mdSize * 16) {
Serial.printf("ICY metadata:\n%s\n---end---\n", mdBuff);
free(mdBuff);
}
}
icyByteCount = 0;
}
int ret = stream->readBytes(reinterpret_cast<uint8_t*>(data), len);
read += ret;
pos += ret;
icyByteCount += ret;
return read;
}