Skip to content

GitLab

E
ESP32-audioI2S
Unverified Commit 8d416ae3 authored by Wolle's avatar Wolle Committed by GitHub
Browse files
Options

other m3u8 streams work 

http://mdstrm.com/audio/6237761f64b72676f05cf6ab/live.m3u8
https://live7digi.antenaplay.ro/radiozu/radiozu.m3u8
http://us-b4-p-e-zs14-audio.cdn.mdstrm.com/live-audio-aw-bkp/6237761f64b72676f05cf6ab/playlist.m3u8?listeningSessionID=62a10f0200a9bf00_2098051_cKYJo206__0000001WWlO
parent 092a722a
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 30 deletions
src/Audio.cpp
View file @ 8d416ae3
......@@ -3,8 +3,8 @@
*
* Created on: Oct 26.2018
*
* Version 2.0.5c
* Updated on: Jul 31.2022
* Version 2.0.5d
* Updated on: Aug 01.2022
* Author: Wolle (schreibfaul1)
*
*/
......@@ -303,6 +303,7 @@ void Audio::setDefaults() {
if(m_m3u8_lastEntry) {free(m_m3u8_lastEntry); m_m3u8_lastEntry = NULL;} // free if stream is not m3u8
vector_clear_and_shrink(m_playlistURL);
vector_clear_and_shrink(m_playlistContent);
m_hashQueue.clear(); m_hashQueue.shrink_to_fit(); // uint32_t vector
client.stop();
client.flush(); // release memory
clientsecure.stop();
......@@ -582,6 +583,7 @@ bool Audio::httpPrint(const char* host) {
setDatamode(HTTP_RESPONSE_HEADER); // Handle header
m_streamType = ST_WEBSTREAM;
m_contentlength = 0;
if(hostwoext) {free(hostwoext); hostwoext = NULL;}
if(extension) {free(extension); extension = NULL;}
......@@ -2322,8 +2324,8 @@ void Audio::loop() {
}
break;
case AUDIO_DATA:
if(m_f_ts) processWebStreamTS();
else processWebStreamHLS();
if(m_f_ts) processWebStreamTS(); // aac or aacp with ts packets
else processWebStreamHLS(); // aac or aacp normal stream
if(f_noNewHost){
m_f_continue = false;
if(timestamp2 < millis()) {
......@@ -2369,9 +2371,10 @@ bool Audio::readPlayListData() {
pl[pos] = _client->read();
if(pl[pos] == '\n') {pl[pos] = '\0'; pos++; break;}
// if(pl[pos] == '&' ) {pl[pos] = '\0'; pos++; break;}
if(pl[pos] == '\r') {pl[pos] = '\0'; pos++; break;}
if(pl[pos] == '\r') {pl[pos] = '\0'; pos++; continue;;}
pos++;
if(pos == 510) {pl[pos] = '\0'; break;}
if(pos == 511){ pos--; ctl++; continue;}
if(pos == 510) {pl[pos] = '\0';}
}
ctl += pos;
if(pos) {pl[pos] = '\0'; break;}
......@@ -2629,26 +2632,30 @@ const char* Audio::parsePlaylist_M3U8(){
tmp = strdup(m_playlistContent[i]);
}
if(!m_m3u8_lastEntry){ // first init
m_playlistURL.insert(m_playlistURL.begin(), strdup((const char*)(tmp)));
m_m3u8_lastEntry = strdup(tmp);
if(m_f_Log) log_i("insert %s", tmp);
continue;
}
if(strcmp(tmp, m_m3u8_lastEntry) > 0 || strlen(tmp) > strlen(m_m3u8_lastEntry)){ // next sequence?,
//strcmp: '2.aac'>'1.aac' or strlen '10.aac'>'9.aac'
m_playlistURL.insert(m_playlistURL.begin(), strdup((const char*)(tmp)));
if(m_m3u8_lastEntry){free(m_m3u8_lastEntry); m_m3u8_lastEntry = strdup(tmp);}
assert(m_m3u8_lastEntry != tmp); // no free space in task?
if(m_f_Log) log_i("insert %s", tmp);
uint32_t hash = simpleHash(tmp);
if(m_hashQueue.size() == 0){
m_hashQueue.insert(m_hashQueue.begin(), hash);
m_playlistURL.insert(m_playlistURL.begin(), strdup(tmp));
}
else{
if(m_f_Log) log_i("file already known %s", m_playlistContent[i]);
bool known = false;
for(int i = 0; i< m_hashQueue.size(); i++){
if(hash == m_hashQueue[i]){
if(m_f_Log) log_i("file already known %s", tmp);
known = true;
}
}
if(!known){
m_hashQueue.insert(m_hashQueue.begin(), hash);
m_playlistURL.insert(m_playlistURL.begin(), strdup(tmp));
}
}
if(m_hashQueue.size() > 20) m_hashQueue.pop_back();
if(tmp){free(tmp); tmp = NULL;}
if(m_playlistURL.size() == 100){
if(m_playlistURL.size() == 20){
ESP_LOGD("", "can't stuff anymore");
break;
}
......@@ -3445,10 +3452,10 @@ bool Audio::parseHttpResponseHeader() { // this is the response to a GET / reque
if(b < 0x20) continue;
rhl[pos] = b;
pos++;
if(pos == 511){pos = 510; continue;}
if(pos == 510){
rhl[pos] = '\0';
if(m_f_Log) log_i("responseHeaderline overflow");
break;
}
} // inner while
......
src/Audio.h
View file @ 8d416ae3
......@@ -2,7 +2,7 @@
* Audio.h
*
* Created on: Oct 28,2018
* Updated on: Jul 31,2022
* Updated on: Aug 01,2022
* Author: Wolle (schreibfaul1)
*/
......@@ -399,6 +399,15 @@ private:
vec.clear();
vec.shrink_to_fit();
}
uint32_t simpleHash(const char* str){
if(str == NULL) return 0;
uint32_t hash = 0;
for(int i=0; i<strlen(str); i++){
if(str[i] < 32) continue; // ignore control sign
hash += (str[i] - 31) * i * 32;
}
return hash;
}
private:
const char *codecname[9] = {"unknown", "WAV", "MP3", "AAC", "M4A", "FLAC", "OGG", "OGG FLAC", "OPUS"};
......@@ -434,14 +443,15 @@ private:
int pids[4];
} pid_array;
File audiofile; // @suppress("Abstract class cannot be instantiated")
WiFiClient client; // @suppress("Abstract class cannot be instantiated")
WiFiClientSecure clientsecure; // @suppress("Abstract class cannot be instantiated")
WiFiClient* _client = nullptr;
i2s_config_t m_i2s_config = {}; // stores values for I2S driver
i2s_pin_config_t m_pin_config = {};
std::vector<char*> m_playlistContent; // m3u8 playlist buffer
std::vector<char*> m_playlistURL; // m3u8 streamURLs buffer
File audiofile; // @suppress("Abstract class cannot be instantiated")
WiFiClient client; // @suppress("Abstract class cannot be instantiated")
WiFiClientSecure clientsecure; // @suppress("Abstract class cannot be instantiated")
WiFiClient* _client = nullptr;
i2s_config_t m_i2s_config = {}; // stores values for I2S driver
i2s_pin_config_t m_pin_config = {};
std::vector<char*> m_playlistContent; // m3u8 playlist buffer
std::vector<char*> m_playlistURL; // m3u8 streamURLs buffer
std::vector<uint32_t> m_hashQueue;
const size_t m_frameSizeWav = 1600;
const size_t m_frameSizeMP3 = 1600;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment