Skip to content

GitLab

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

u_int_8t renamed and new HLS streams work #334 

new working streams
http://18683.live.streamtheworld.com:3690/XHPIFMAAC/HLSTS/playlist.m3u8
http://26373.live.streamtheworld.com:3690/XHQQ_FMAAC/HLSTS/playlist.m3u8
http://20283.live.streamtheworld.com/XHQQ_FMAAC/HLSTS/playlist.m3u8
http://19003.live.streamtheworld.com/BLUE_FM_100_7AAC/HLSTS/playlist.m3u8
parent 6793db0b
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 74 deletions
src/Audio.cpp
View file @ a4ae2188
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Created on: Oct 26.2018 * Created on: Oct 26.2018
* *
* Version 2.0.5a * Version 2.0.5b
* Updated on: Jul 28.2022 * Updated on: Jul 28.2022
* Author: Wolle (schreibfaul1) * Author: Wolle (schreibfaul1)
* *
...@@ -159,6 +159,9 @@ Audio::Audio(bool internalDAC /* = false */, uint8_t channelEnabled /* = I2S_DAC ...@@ -159,6 +159,9 @@ Audio::Audio(bool internalDAC /* = false */, uint8_t channelEnabled /* = I2S_DAC
// I2S_DAC_CHANNEL_LEFT_EN = 2, Enable I2S built-in DAC left channel, maps to DAC channel 2 on GPIO26 // I2S_DAC_CHANNEL_LEFT_EN = 2, Enable I2S built-in DAC left channel, maps to DAC channel 2 on GPIO26
// I2S_DAC_CHANNEL_BOTH_EN = 0x3, Enable both of the I2S built-in DAC channels. // I2S_DAC_CHANNEL_BOTH_EN = 0x3, Enable both of the I2S built-in DAC channels.
// I2S_DAC_CHANNEL_MAX = 0x4, I2S built-in DAC mode max index // I2S_DAC_CHANNEL_MAX = 0x4, I2S built-in DAC mode max index
#ifdef AUDIO_LOG
m_f_Log = true;
#endif
clientsecure.setInsecure(); // if that can't be resolved update to ESP32 Arduino version 1.0.5-rc05 or higher clientsecure.setInsecure(); // if that can't be resolved update to ESP32 Arduino version 1.0.5-rc05 or higher
m_f_channelEnabled = channelEnabled; m_f_channelEnabled = channelEnabled;
...@@ -332,7 +335,6 @@ void Audio::setDefaults() { ...@@ -332,7 +335,6 @@ void Audio::setDefaults() {
m_f_rtsp = false; // RTSP (m3u8)stream m_f_rtsp = false; // RTSP (m3u8)stream
m_f_m3u8data = false; // set again in processM3U8entries() if necessary m_f_m3u8data = false; // set again in processM3U8entries() if necessary
m_f_continue = false; m_f_continue = false;
m_f_Log = true; // logging always allowed
m_f_ts = false; m_f_ts = false;
m_streamType = ST_NONE; m_streamType = ST_NONE;
...@@ -1211,7 +1213,6 @@ int Audio::read_FLAC_Header(uint8_t *data, size_t len) { ...@@ -1211,7 +1213,6 @@ int Audio::read_FLAC_Header(uint8_t *data, size_t len) {
stopSong(); stopSong();
return -1; return -1;
} }
// log_i("Magig String found");
m_controlCounter = FLAC_MBH; m_controlCounter = FLAC_MBH;
headerSize = 4; headerSize = 4;
retvalue = 4; retvalue = 4;
...@@ -1483,11 +1484,11 @@ int Audio::read_ID3_Header(uint8_t *data, size_t len) { ...@@ -1483,11 +1484,11 @@ int Audio::read_ID3_Header(uint8_t *data, size_t len) {
headerSize--; headerSize--;
uint32_t decompsize = 0; uint32_t decompsize = 0;
if(compressed){ if(compressed){
log_i("iscompressed"); if(m_f_Log) log_i("iscompressed");
decompsize = bigEndian(data + 6, 4); decompsize = bigEndian(data + 6, 4);
headerSize -= 4; headerSize -= 4;
(void) decompsize; (void) decompsize;
log_i("decompsize=%u", decompsize); if(m_f_Log) log_i("decompsize=%u", decompsize);
return 6 + 4; return 6 + 4;
} }
return 6; return 6;
...@@ -1513,7 +1514,6 @@ int Audio::read_ID3_Header(uint8_t *data, size_t len) { ...@@ -1513,7 +1514,6 @@ int Audio::read_ID3_Header(uint8_t *data, size_t len) {
bool isUnicode = (ch==1) ? true : false; bool isUnicode = (ch==1) ? true : false;
if(startsWith(tag, "APIC")) { // a image embedded in file, passing it to external function if(startsWith(tag, "APIC")) { // a image embedded in file, passing it to external function
//log_i("framesize=%i", framesize);
isUnicode = false; isUnicode = false;
if(m_datamode == AUDIO_LOCALFILE){ if(m_datamode == AUDIO_LOCALFILE){
APIC_seen = true; APIC_seen = true;
...@@ -1696,7 +1696,7 @@ int Audio::read_M4A_Header(uint8_t *data, size_t len) { ...@@ -1696,7 +1696,7 @@ int Audio::read_M4A_Header(uint8_t *data, size_t len) {
atomName[3] = *(data + 3); atomName[3] = *(data + 3);
atomName[4] = 0; atomName[4] = 0;
log_i("atom %s found", atomName); if(m_f_Log) log_i("atom %s found", atomName);
retvalue = atomsize; retvalue = atomsize;
headerSize += atomsize; headerSize += atomsize;
...@@ -1854,7 +1854,6 @@ int Audio::read_M4A_Header(uint8_t *data, size_t len) { ...@@ -1854,7 +1854,6 @@ int Audio::read_M4A_Header(uint8_t *data, size_t len) {
if(m_controlCounter == M4A_AMRDY){ // almost ready if(m_controlCounter == M4A_AMRDY){ // almost ready
m_audioDataStart = headerSize; m_audioDataStart = headerSize;
// m_contentlength = headerSize + m_audioDataSize; // after this mdat atom there may be other atoms // m_contentlength = headerSize + m_audioDataSize; // after this mdat atom there may be other atoms
// log_i("begin mdat %i", headerSize);
if(m_datamode == AUDIO_LOCALFILE){ if(m_datamode == AUDIO_LOCALFILE){
AUDIO_INFO("Content-Length: %u", m_contentlength); AUDIO_INFO("Content-Length: %u", m_contentlength);
} }
...@@ -1971,7 +1970,7 @@ int Audio::read_OGG_Header(uint8_t *data, size_t len){ ...@@ -1971,7 +1970,7 @@ int Audio::read_OGG_Header(uint8_t *data, size_t len){
if(specialIndexOf(data + i, "FLAC", 10) == 0){ if(specialIndexOf(data + i, "FLAC", 10) == 0){
} }
else{ else{
log_i("ogg/flac support only"); // ogg/vorbis or ogg//opus not supported yet log_e("ogg/flac support only"); // ogg/vorbis or ogg//opus not supported yet
stopSong(); stopSong();
return -1; return -1;
} }
...@@ -2204,6 +2203,7 @@ bool Audio::playChunk() { ...@@ -2204,6 +2203,7 @@ bool Audio::playChunk() {
void Audio::loop() { void Audio::loop() {
if(!m_f_running) return; if(!m_f_running) return;
static bool f_noHost = false;
switch(m_datamode){ switch(m_datamode){
case AUDIO_LOCALFILE: case AUDIO_LOCALFILE:
...@@ -2218,33 +2218,35 @@ void Audio::loop() { ...@@ -2218,33 +2218,35 @@ void Audio::loop() {
case AUDIO_PLAYLISTDATA: case AUDIO_PLAYLISTDATA:
const char* host; const char* host;
if(m_playlistFormat == FORMAT_M3U) host = parsePlaylist_M3U(); if(m_playlistFormat == FORMAT_M3U) host = parsePlaylist_M3U();
if(m_playlistFormat == FORMAT_M3U8) host = parsePlaylist_M3U8();
if(m_playlistFormat == FORMAT_PLS) host = parsePlaylist_PLS(); if(m_playlistFormat == FORMAT_PLS) host = parsePlaylist_PLS();
if(m_playlistFormat == FORMAT_ASX) host = parsePlaylist_ASX(); if(m_playlistFormat == FORMAT_ASX) host = parsePlaylist_ASX();
if(m_playlistFormat == FORMAT_M3U8){ host = parsePlaylist_M3U8();
m_f_m3u8data = true;
m_m3u8_timeStamp = millis() + m_m3u8_targetDuration * 1500; // /1.5 playtime of the file
}
if(host){ if(host){
if(m_playlistFormat == FORMAT_M3U8) m_f_m3u8data = true;
if(!_client){stopSong(); log_e("no client found!"); return;} if(!_client){stopSong(); log_e("no client found!"); return;}
f_noHost = false;
connecttohost(host); connecttohost(host);
} }
else { else {
if(m_f_ts) m_m3u8_timeStamp = millis() + m_m3u8_targetDuration * 600; // sower because unpack ts frames f_noHost = true;
else m_m3u8_timeStamp = millis() + m_m3u8_targetDuration * 1200; m_m3u8_timeStamp = millis() + m_m3u8_targetDuration * 1500; // /1.5 playtime of the file
setDatamode(AUDIO_DATA); //fake datamode, we have no new audiosequence yet, so let audio run setDatamode(AUDIO_DATA); //fake datamode, we have no new audiosequence yet, so let audio run
} }
break; /* fall through */
case AUDIO_DATA: case AUDIO_DATA:
if((m_playlistFormat == FORMAT_M3U8) && m_f_continue){ // processWebStream() needs more data if(m_f_ts) processWebStreamTS();
m_f_continue = false; else processWebStream();
setDatamode(AUDIO_PLAYLISTDATA);
} if(m_playlistFormat == FORMAT_M3U8){
else if(m_m3u8_timeStamp > 0 && m_m3u8_timeStamp < millis()){ if(m_f_continue){ // processWebStream() needs more data
m_m3u8_timeStamp = 0; setDatamode(AUDIO_PLAYLISTDATA);
m_f_m3u8data = true; m_f_continue = false;
connecttohost(m_lastHost); }
} if(f_noHost && m_m3u8_timeStamp < millis()){
else{ connecttohost(m_lastHost);
if(m_f_ts) processWebStreamTS(); }
else processWebStream();
} }
break; break;
} }
...@@ -2294,7 +2296,7 @@ bool Audio::readPlayListData() { ...@@ -2294,7 +2296,7 @@ bool Audio::readPlayListData() {
if(startsWith(pl, "<!DOCTYPE")) {AUDIO_INFO("url is a webpage!"); goto exit;} if(startsWith(pl, "<!DOCTYPE")) {AUDIO_INFO("url is a webpage!"); goto exit;}
if(strlen(pl) > 0) m_playlistContent.push_back(strdup((const char*)pl)); if(strlen(pl) > 0) m_playlistContent.push_back(strdup((const char*)pl));
if(m_playlistContent.size() == 100){ if(m_playlistContent.size() == 100){
log_d("the maximum number of lines in the playlist has been reached"); if(m_f_Log) log_i("the maximum number of lines in the playlist has been reached");
break; break;
} }
if(ctl == m_contentlength){break;} if(ctl == m_contentlength){break;}
...@@ -2303,7 +2305,7 @@ bool Audio::readPlayListData() { ...@@ -2303,7 +2305,7 @@ bool Audio::readPlayListData() {
} // outer while6nUfOrsqhhT-331 } // outer while6nUfOrsqhhT-331
lines = m_playlistContent.size(); lines = m_playlistContent.size();
for (int i = 0; i < lines ; i++) { // print all string in first vector of 'arr' for (int i = 0; i < lines ; i++) { // print all string in first vector of 'arr'
log_d("pl=%i \"%s\"", i, m_playlistContent[i]); if(m_f_Log) log_i("pl=%i \"%s\"", i, m_playlistContent[i]);
} }
m_datamode = AUDIO_PLAYLISTDATA; m_datamode = AUDIO_PLAYLISTDATA;
return true; return true;
...@@ -2462,6 +2464,11 @@ const char* Audio::parsePlaylist_M3U8(){ ...@@ -2462,6 +2464,11 @@ const char* Audio::parsePlaylist_M3U8(){
occurence++; occurence++;
if(!endsWith(m_playlistContent[i+1], "m3u8")){ // we have a new m3u8 playlist, skip to next line if(!endsWith(m_playlistContent[i+1], "m3u8")){ // we have a new m3u8 playlist, skip to next line
int pos = indexOf(m_playlistContent[i], "CODECS=\"mp4a", 18); int pos = indexOf(m_playlistContent[i], "CODECS=\"mp4a", 18);
// 'mp4a.40.01' AAC Main
// 'mp4a.40.02' AAC LC (Low Complexity)
// 'mp4a.40.03' AAC SSR (Scalable Sampling Rate) ??
// 'mp4a.40.03' AAC LTP (Long Term Prediction) ??
// 'mp4a.40.03' SBR (Spectral Band Replication)
if(pos < 0){ // not found if(pos < 0){ // not found
int pos1 = indexOf(m_playlistContent[i], "CODECS=", 18); int pos1 = indexOf(m_playlistContent[i], "CODECS=", 18);
if(pos1 < 0) pos1 = 0; if(pos1 < 0) pos1 = 0;
...@@ -2488,7 +2495,7 @@ const char* Audio::parsePlaylist_M3U8(){ ...@@ -2488,7 +2495,7 @@ const char* Audio::parsePlaylist_M3U8(){
if(m_playlistContent[i]){free(m_playlistContent[i]); m_playlistContent[i] = NULL;} if(m_playlistContent[i]){free(m_playlistContent[i]); m_playlistContent[i] = NULL;}
m_playlistContent[i] = strdup(tmp); m_playlistContent[i] = strdup(tmp);
if(tmp){free(tmp); tmp = NULL;} if(tmp){free(tmp); tmp = NULL;}
log_d("redirect %s", m_playlistContent[i]); if(m_f_Log) log_i("redirect %s", m_playlistContent[i]);
return m_playlistContent[i]; // it's a redirection, a new m3u8 playlist return m_playlistContent[i]; // it's a redirection, a new m3u8 playlist
} }
...@@ -2509,7 +2516,7 @@ const char* Audio::parsePlaylist_M3U8(){ ...@@ -2509,7 +2516,7 @@ const char* Audio::parsePlaylist_M3U8(){
targetDuration = atoi(m_playlistContent[i] + 22); targetDuration = atoi(m_playlistContent[i] + 22);
} }
if(targetDuration) m_m3u8_targetDuration = targetDuration; if(targetDuration) m_m3u8_targetDuration = targetDuration;
log_d("m_m3u8_targetDuration %d", m_m3u8_targetDuration); if(m_f_Log) log_i("m_m3u8_targetDuration %d", m_m3u8_targetDuration);
if(startsWith(m_playlistContent[i],"#EXTINF")) { if(startsWith(m_playlistContent[i],"#EXTINF")) {
if(STfromEXTINF(m_playlistContent[i])) showstreamtitle(chbuf); if(STfromEXTINF(m_playlistContent[i])) showstreamtitle(chbuf);
...@@ -2530,14 +2537,15 @@ const char* Audio::parsePlaylist_M3U8(){ ...@@ -2530,14 +2537,15 @@ const char* Audio::parsePlaylist_M3U8(){
if(!m_m3u8_lastEntry){ // first init if(!m_m3u8_lastEntry){ // first init
m_playlistURL.insert(m_playlistURL.begin(), strdup((const char*)(tmp))); m_playlistURL.insert(m_playlistURL.begin(), strdup((const char*)(tmp)));
m_m3u8_lastEntry = strdup(tmp); m_m3u8_lastEntry = strdup(tmp);
log_d("insert %s", tmp); if(m_f_Log) log_i("insert %s", tmp);
continue; continue;
} }
if(strcmp(tmp, m_m3u8_lastEntry) > 0){ // next sequence?, 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))); m_playlistURL.insert(m_playlistURL.begin(), strdup((const char*)(tmp)));
if(m_m3u8_lastEntry){free(m_m3u8_lastEntry); m_m3u8_lastEntry = strdup(tmp);} if(m_m3u8_lastEntry){free(m_m3u8_lastEntry); m_m3u8_lastEntry = strdup(tmp);}
assert(m_m3u8_lastEntry != tmp); // no free space in task? assert(m_m3u8_lastEntry != tmp); // no free space in task?
log_d("insert %s", tmp); if(m_f_Log) log_i("insert %s", tmp);
} }
else{ else{
AUDIO_INFO("file already known %s", m_playlistContent[i]); AUDIO_INFO("file already known %s", m_playlistContent[i]);
...@@ -2565,7 +2573,7 @@ const char* Audio::parsePlaylist_M3U8(){ ...@@ -2565,7 +2573,7 @@ const char* Audio::parsePlaylist_M3U8(){
m_playlistURL.pop_back(); m_playlistURL.pop_back();
m_playlistURL.shrink_to_fit(); m_playlistURL.shrink_to_fit();
} }
log_d("now playing %s", m_playlistBuff); if(m_f_Log) log_i("now playing %s", m_playlistBuff);
return m_playlistBuff; return m_playlistBuff;
} }
else{ else{
...@@ -2638,7 +2646,7 @@ void Audio::processLocalFile() { ...@@ -2638,7 +2646,7 @@ void Audio::processLocalFile() {
if(m_avr_bitrate) m_audioCurrentTime = ((m_resumeFilePos - m_audioDataStart) / m_avr_bitrate) * 8; if(m_avr_bitrate) m_audioCurrentTime = ((m_resumeFilePos - m_audioDataStart) / m_avr_bitrate) * 8;
audiofile.seek(m_resumeFilePos); audiofile.seek(m_resumeFilePos);
InBuff.resetBuffer(); InBuff.resetBuffer();
log_i("m_resumeFilePos %i", m_resumeFilePos); if(m_f_Log) log_i("m_resumeFilePos %i", m_resumeFilePos);
} }
} }
...@@ -2924,6 +2932,7 @@ void Audio::processWebStream() { ...@@ -2924,6 +2932,7 @@ void Audio::processWebStream() {
if(InBuff.bufferFilled() > maxFrameSize && !f_stream) { // waiting for buffer filled if(InBuff.bufferFilled() > maxFrameSize && !f_stream) { // waiting for buffer filled
f_stream = true; // ready to play the audio data f_stream = true; // ready to play the audio data
uint16_t filltime = millis() - m_t0; uint16_t filltime = millis() - m_t0;
AUDIO_INFO("stream ready"); AUDIO_INFO("stream ready");
AUDIO_INFO("buffer filled in %d ms", filltime); AUDIO_INFO("buffer filled in %d ms", filltime);
} }
...@@ -3000,6 +3009,7 @@ void Audio::processWebStream() { ...@@ -3000,6 +3009,7 @@ void Audio::processWebStream() {
else data2decode = maxFrameSize; else data2decode = maxFrameSize;
if(m_streamType == ST_WEBFILE){ if(m_streamType == ST_WEBFILE){
bytesDecoded = sendBytes(InBuff.getReadPtr(), data2decode); bytesDecoded = sendBytes(InBuff.getReadPtr(), data2decode);
if(bytesDecoded > 0) audioDataCount += bytesDecoded; if(bytesDecoded > 0) audioDataCount += bytesDecoded;
...@@ -3199,7 +3209,7 @@ bool Audio::parseHttpResponseHeader() { // this is the response to a GET / reque ...@@ -3199,7 +3209,7 @@ bool Audio::parseHttpResponseHeader() { // this is the response to a GET / reque
while(true){ // outer while while(true){ // outer while
uint16_t pos = 0; uint16_t pos = 0;
if((millis() - ctime) > timeout) { if((millis() - ctime) > timeout) {
ESP_LOGE("parseHttpResponseHeader", "timeout"); log_e("timeout");
goto exit; goto exit;
} }
while(_client->available()){ while(_client->available()){
...@@ -3217,14 +3227,14 @@ bool Audio::parseHttpResponseHeader() { // this is the response to a GET / reque ...@@ -3217,14 +3227,14 @@ bool Audio::parseHttpResponseHeader() { // this is the response to a GET / reque
pos++; pos++;
if(pos == 510){ if(pos == 510){
rhl[pos] = '\0'; rhl[pos] = '\0';
log_d("responseHeaderline overflow"); if(m_f_Log) log_i("responseHeaderline overflow");
break; break;
} }
} // inner while } // inner while
if(!pos) {vTaskDelay(3); continue;} if(!pos) {vTaskDelay(3); continue;}
if(m_f_Log) {log_d("httpResponseHeader: %s", rhl);} if(m_f_Log) {log_i("httpResponseHeader: %s", rhl);}
int16_t posColon = indexOf(rhl, ":", 0); // lowercase all letters up to the colon int16_t posColon = indexOf(rhl, ":", 0); // lowercase all letters up to the colon
if(posColon >= 0) { if(posColon >= 0) {
...@@ -3484,7 +3494,7 @@ uint16_t Audio::readMetadata(uint16_t maxBytes, bool first) { ...@@ -3484,7 +3494,7 @@ uint16_t Audio::readMetadata(uint16_t maxBytes, bool first) {
// Sometimes it is just other info like: // Sometimes it is just other info like:
// "StreamTitle='60s 03 05 Magic60s';StreamUrl='';" // "StreamTitle='60s 03 05 Magic60s';StreamUrl='';"
// Isolate the StreamTitle, remove leading and trailing quotes if present. // Isolate the StreamTitle, remove leading and trailing quotes if present.
// log_i("ST %s", metaline); if(m_f_Log) log_i("metaline %s", chbuf);
latinToUTF8(chbuf, sizeof(chbuf)); // convert to UTF-8 if necessary latinToUTF8(chbuf, sizeof(chbuf)); // convert to UTF-8 if necessary
int pos = indexOf(chbuf, "song_spot", 0); // remove some irrelevant infos int pos = indexOf(chbuf, "song_spot", 0); // remove some irrelevant infos
if(pos > 3) { // e.g. song_spot="T" MediaBaseId="0" itunesTrackId="0" if(pos > 3) { // e.g. song_spot="T" MediaBaseId="0" itunesTrackId="0"
...@@ -3516,7 +3526,7 @@ bool Audio::parseContentType(char* ct) { ...@@ -3516,7 +3526,7 @@ bool Audio::parseContentType(char* ct) {
if(!strcmp(ct, "audio/aac")) ct_val = CT_AAC; if(!strcmp(ct, "audio/aac")) ct_val = CT_AAC;
if(!strcmp(ct, "audio/x-aac")) ct_val = CT_AAC; if(!strcmp(ct, "audio/x-aac")) ct_val = CT_AAC;
if(!strcmp(ct, "audio/aacp")) ct_val = CT_AAC; if(!strcmp(ct, "audio/aacp")){ ct_val = CT_AAC; if(m_playlistFormat == FORMAT_M3U8) m_f_ts = true;}
if(!strcmp(ct, "video/mp2t")){ ct_val = CT_AAC; m_f_ts = true;} // assume AAC transport stream if(!strcmp(ct, "video/mp2t")){ ct_val = CT_AAC; m_f_ts = true;} // assume AAC transport stream
if(!strcmp(ct, "audio/mp4")) ct_val = CT_M4A; if(!strcmp(ct, "audio/mp4")) ct_val = CT_M4A;
if(!strcmp(ct, "audio/m4a")) ct_val = CT_M4A; if(!strcmp(ct, "audio/m4a")) ct_val = CT_M4A;
...@@ -3783,7 +3793,7 @@ int Audio::sendBytes(uint8_t* data, size_t len) { ...@@ -3783,7 +3793,7 @@ int Audio::sendBytes(uint8_t* data, size_t len) {
return 1; return 1;
} }
if(ret < 0) { // Error, skip the frame... if(ret < 0) { // Error, skip the frame...
//if(m_codec == CODEC_M4A){log_i("begin not found"); return 1;} if(m_f_Log) if(m_codec == CODEC_M4A){log_i("begin not found"); return 1;}
i2s_zero_dma_buffer((i2s_port_t)m_i2s_num); i2s_zero_dma_buffer((i2s_port_t)m_i2s_num);
if(!getChannels() && (ret == -2)) { if(!getChannels() && (ret == -2)) {
; // suppress errorcode MAINDATA_UNDERFLOW ; // suppress errorcode MAINDATA_UNDERFLOW
...@@ -4129,7 +4139,7 @@ void Audio::setI2SCommFMT_LSB(bool commFMT) { ...@@ -4129,7 +4139,7 @@ void Audio::setI2SCommFMT_LSB(bool commFMT) {
// Japanese or called LSBJ (Least Significant Bit Justified) format // Japanese or called LSBJ (Least Significant Bit Justified) format
if (commFMT) { if (commFMT) {
log_i("commFMT LSB"); if(m_f_Log) log_i("commFMT LSB");
#if ESP_ARDUINO_VERSION_MAJOR >= 2 #if ESP_ARDUINO_VERSION_MAJOR >= 2
m_i2s_config.communication_format = (i2s_comm_format_t)(I2S_COMM_FORMAT_STAND_MSB); // v >= 2.0.0 m_i2s_config.communication_format = (i2s_comm_format_t)(I2S_COMM_FORMAT_STAND_MSB); // v >= 2.0.0
...@@ -4139,7 +4149,7 @@ void Audio::setI2SCommFMT_LSB(bool commFMT) { ...@@ -4139,7 +4149,7 @@ void Audio::setI2SCommFMT_LSB(bool commFMT) {
} }
else { else {
log_i("commFMT MSB"); if(m_f_Log) log_i("commFMT MSB");
#if ESP_ARDUINO_VERSION_MAJOR >= 2 #if ESP_ARDUINO_VERSION_MAJOR >= 2
m_i2s_config.communication_format = (i2s_comm_format_t)(I2S_COMM_FORMAT_STAND_I2S); // vers >= 2.0.0 m_i2s_config.communication_format = (i2s_comm_format_t)(I2S_COMM_FORMAT_STAND_I2S); // vers >= 2.0.0
...@@ -4148,7 +4158,7 @@ void Audio::setI2SCommFMT_LSB(bool commFMT) { ...@@ -4148,7 +4158,7 @@ void Audio::setI2SCommFMT_LSB(bool commFMT) {
#endif #endif
} }
log_i("commFMT = %i", m_i2s_config.communication_format); AUDIO_INFO("commFMT = %i", m_i2s_config.communication_format);
i2s_driver_uninstall((i2s_port_t)m_i2s_num); i2s_driver_uninstall((i2s_port_t)m_i2s_num);
i2s_driver_install ((i2s_port_t)m_i2s_num, &m_i2s_config, 0, NULL); i2s_driver_install ((i2s_port_t)m_i2s_num, &m_i2s_config, 0, NULL);
} }
...@@ -4512,11 +4522,9 @@ int16_t* Audio::IIR_filterChain2(int16_t iir_in[2], bool clear){ // Infinite Im ...@@ -4512,11 +4522,9 @@ int16_t* Audio::IIR_filterChain2(int16_t iir_in[2], bool clear){ // Infinite Im
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packetLength) { bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packetLength) {
bool(debug) = false; const uint8_t TS_PACKET_SIZE = 188;
const uint8_t PAYLOAD_SIZE = 184;
const u_int8_t TS_PACKET_SIZE = 188; const uint8_t PID_ARRAY_LEN = 4;
const u_int8_t PAYLOAD_SIZE = 184;
const u_int8_t PID_ARRAY_LEN = 4;
typedef struct{ typedef struct{
int number= 0; int number= 0;
...@@ -4528,7 +4536,7 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe ...@@ -4528,7 +4536,7 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe
static int pidOfAAC = 0; static int pidOfAAC = 0;
if(packet == NULL){ if(packet == NULL){
log_i("reset"); if(m_f_Log) log_i("parseTS reset");
for(int i = 0; i < PID_ARRAY_LEN; i++) pidsOfPMT.pids[i] = 0; for(int i = 0; i < PID_ARRAY_LEN; i++) pidsOfPMT.pids[i] = 0;
PES_DataLength = 0; PES_DataLength = 0;
pidOfAAC = 0; pidOfAAC = 0;
...@@ -4562,35 +4570,34 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe ...@@ -4562,35 +4570,34 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe
return false; return false;
} }
int PID = (packet[1] & 0x1F) << 8 | (packet[2] & 0xFF); int PID = (packet[1] & 0x1F) << 8 | (packet[2] & 0xFF);
if(debug) printf("PID: 0x%04X(%d)\n", PID, PID); if(m_f_Log) log_i("PID: 0x%04X(%d)", PID, PID);
int PUSI = (packet[1] & 0x40) >> 6; int PUSI = (packet[1] & 0x40) >> 6;
if(debug) printf("Payload Unit Start Indicator: %d\n", PUSI); if(m_f_Log) log_i("Payload Unit Start Indicator: %d", PUSI);
int AFC = (packet[3] & 0x30) >> 4; int AFC = (packet[3] & 0x30) >> 4;
if(debug) printf("Adaption Field Control: %d\n", AFC); if(m_f_Log) log_i("Adaption Field Control: %d", AFC);
int AFL = -1; int AFL = -1;
if((AFC & 0b10) == 0b10) { // AFC '11' Adaptation Field followed if((AFC & 0b10) == 0b10) { // AFC '11' Adaptation Field followed
AFL = packet[4] & 0xFF; // Adaptation Field Length AFL = packet[4] & 0xFF; // Adaptation Field Length
if(debug) printf("Adaptation Field Length: %d\n", AFL); if(m_f_Log) log_i("Adaptation Field Length: %d", AFL);
} }
int PLS = PUSI ? 5 : 4; // PayLoadStart, Payload Unit Start Indicator int PLS = PUSI ? 5 : 4; // PayLoadStart, Payload Unit Start Indicator
if(PID == 0) { if(PID == 0) {
// Program Association Table (PAT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // Program Association Table (PAT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// log_i("PAT"); if(m_f_Log) log_i("PAT");
if(debug) printf("PAT\n");
pidsOfPMT.number = 0; pidsOfPMT.number = 0;
pidOfAAC = 0; pidOfAAC = 0;
int startOfProgramNums = 8; int startOfProgramNums = 8;
int lengthOfPATValue = 4; int lengthOfPATValue = 4;
int sectionLength = ((packet[PLS + 1] & 0x0F) << 8) | (packet[PLS + 2] & 0xFF); int sectionLength = ((packet[PLS + 1] & 0x0F) << 8) | (packet[PLS + 2] & 0xFF);
if(debug) printf("Section Length: %d\n", sectionLength); if(m_f_Log) log_i("Section Length: %d", sectionLength);
int program_number, program_map_PID; int program_number, program_map_PID;
int indexOfPids = 0; int indexOfPids = 0;
for(int i = startOfProgramNums; i <= sectionLength; i += lengthOfPATValue) { for(int i = startOfProgramNums; i <= sectionLength; i += lengthOfPATValue) {
program_number = ((packet[PLS + i] & 0xFF) << 8) | (packet[PLS + i + 1] & 0xFF); program_number = ((packet[PLS + i] & 0xFF) << 8) | (packet[PLS + i + 1] & 0xFF);
program_map_PID = ((packet[PLS + i + 2] & 0x1F) << 8) | (packet[PLS + i + 3] & 0xFF); program_map_PID = ((packet[PLS + i + 2] & 0x1F) << 8) | (packet[PLS + i + 3] & 0xFF);
if(debug) printf("Program Num: 0x%04X(%d) PMT PID: 0x%04X(%d)\n", program_number, program_number, if(m_f_Log) log_i("Program Num: 0x%04X(%d) PMT PID: 0x%04X(%d)", program_number, program_number,
program_map_PID, program_map_PID); program_map_PID, program_map_PID);
pidsOfPMT.pids[indexOfPids++] = program_map_PID; pidsOfPMT.pids[indexOfPids++] = program_map_PID;
} }
...@@ -4601,10 +4608,10 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe ...@@ -4601,10 +4608,10 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe
} }
else if(PID == pidOfAAC) { else if(PID == pidOfAAC) {
if(debug) printf("AAC\n"); if(m_f_Log) log_i("AAC");
uint8_t posOfPacketStart = 4; uint8_t posOfPacketStart = 4;
if(AFL >= 0) {posOfPacketStart = 5 + AFL; if(AFL >= 0) {posOfPacketStart = 5 + AFL;
if(debug)printf("posOfPacketStart: %d\n", posOfPacketStart);} if(m_f_Log) log_i("posOfPacketStart: %d", posOfPacketStart);}
// Packetized Elementary Stream (PES) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // Packetized Elementary Stream (PES) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if (PES_DataLength > 0) { if (PES_DataLength > 0) {
*packetStart = posOfPacketStart; *packetStart = posOfPacketStart;
...@@ -4616,7 +4623,7 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe ...@@ -4616,7 +4623,7 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe
int firstByte = packet[posOfPacketStart] & 0xFF; int firstByte = packet[posOfPacketStart] & 0xFF;
int secondByte = packet[posOfPacketStart + 1] & 0xFF; int secondByte = packet[posOfPacketStart + 1] & 0xFF;
int thirdByte = packet[posOfPacketStart + 2] & 0xFF; int thirdByte = packet[posOfPacketStart + 2] & 0xFF;
if(debug) printf("First 3 bytes: %02X %02X %02X\n", firstByte, secondByte, thirdByte); if(m_f_Log) log_i("First 3 bytes: %02X %02X %02X", firstByte, secondByte, thirdByte);
if(firstByte == 0x00 && secondByte == 0x00 && thirdByte == 0x01) { // Packet start code prefix if(firstByte == 0x00 && secondByte == 0x00 && thirdByte == 0x01) { // Packet start code prefix
// PES // PES
uint8_t StreamID = packet[posOfPacketStart + 3] & 0xFF; uint8_t StreamID = packet[posOfPacketStart + 3] & 0xFF;
...@@ -4625,13 +4632,13 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe ...@@ -4625,13 +4632,13 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe
const uint8_t posOfPacketLengthLatterHalf = 5; const uint8_t posOfPacketLengthLatterHalf = 5;
int PES_PacketLength = int PES_PacketLength =
((packet[posOfPacketStart + 4] & 0xFF) << 8) + (packet[posOfPacketStart + 5] & 0xFF); ((packet[posOfPacketStart + 4] & 0xFF) << 8) + (packet[posOfPacketStart + 5] & 0xFF);
if(debug) printf("PES Packet length: %d\n", PES_PacketLength); if(m_f_Log) log_i("PES Packet length: %d", PES_PacketLength);
PES_DataLength = PES_PacketLength; PES_DataLength = PES_PacketLength;
int posOfHeaderLength = 8; int posOfHeaderLength = 8;
int PESRemainingHeaderLength = packet[posOfPacketStart + posOfHeaderLength] & 0xFF; int PESRemainingHeaderLength = packet[posOfPacketStart + posOfHeaderLength] & 0xFF;
if(debug) printf("PES Header length: %d\n", PESRemainingHeaderLength); if(m_f_Log) log_i("PES Header length: %d", PESRemainingHeaderLength);
int startOfData = posOfHeaderLength + PESRemainingHeaderLength + 1; int startOfData = posOfHeaderLength + PESRemainingHeaderLength + 1;
if(debug) printf("First AAC data byte: %02X\n", packet[posOfPacketStart + startOfData]); if(m_f_Log) log_i("First AAC data byte: %02X", packet[posOfPacketStart + startOfData]);
*packetStart = posOfPacketStart + startOfData; *packetStart = posOfPacketStart + startOfData;
*packetLength = TS_PACKET_SIZE - posOfPacketStart - startOfData; *packetLength = TS_PACKET_SIZE - posOfPacketStart - startOfData;
PES_DataLength -= (TS_PACKET_SIZE - posOfPacketStart) - (posOfPacketLengthLatterHalf + 1); PES_DataLength -= (TS_PACKET_SIZE - posOfPacketStart) - (posOfPacketLengthLatterHalf + 1);
...@@ -4640,32 +4647,31 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe ...@@ -4640,32 +4647,31 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe
} }
*packetStart = 0; *packetStart = 0;
*packetLength = 0; *packetLength = 0;
// log_e("PES not found"); if(m_f_Log) log_e("PES not found");
return false; return false;
} }
else if(pidsOfPMT.number) { else if(pidsOfPMT.number) {
// Program Map Table (PMT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // Program Map Table (PMT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// log_i("PMT");
for(int i = 0; i < pidsOfPMT.number; i++) { for(int i = 0; i < pidsOfPMT.number; i++) {
if(PID == pidsOfPMT.pids[i]) { if(PID == pidsOfPMT.pids[i]) {
if(debug) printf("PMT\n"); if(m_f_Log) log_i("PMT");
int staticLengthOfPMT = 12; int staticLengthOfPMT = 12;
int sectionLength = ((packet[PLS + 1] & 0x0F) << 8) | (packet[PLS + 2] & 0xFF); int sectionLength = ((packet[PLS + 1] & 0x0F) << 8) | (packet[PLS + 2] & 0xFF);
if(debug) printf("Section Length: %d\n", sectionLength); if(m_f_Log) log_i("Section Length: %d", sectionLength);
int programInfoLength = ((packet[PLS + 10] & 0x0F) << 8) | (packet[PLS + 11] & 0xFF); int programInfoLength = ((packet[PLS + 10] & 0x0F) << 8) | (packet[PLS + 11] & 0xFF);
if(debug) printf("Program Info Length: %d\n", programInfoLength); if(m_f_Log) log_i("Program Info Length: %d", programInfoLength);
int cursor = staticLengthOfPMT + programInfoLength; int cursor = staticLengthOfPMT + programInfoLength;
while(cursor < sectionLength - 1) { while(cursor < sectionLength - 1) {
int streamType = packet[PLS + cursor] & 0xFF; int streamType = packet[PLS + cursor] & 0xFF;
int elementaryPID = ((packet[PLS + cursor + 1] & 0x1F) << 8) | (packet[PLS + cursor + 2] & 0xFF); int elementaryPID = ((packet[PLS + cursor + 1] & 0x1F) << 8) | (packet[PLS + cursor + 2] & 0xFF);
if(debug) printf("Stream Type: 0x%02X Elementary PID: 0x%04X\n", streamType, elementaryPID); if(m_f_Log) log_i("Stream Type: 0x%02X Elementary PID: 0x%04X", streamType, elementaryPID);
if(streamType == 0x0F || streamType == 0x11) { if(streamType == 0x0F || streamType == 0x11) {
if(debug) printf("AAC PID discover\n"); if(m_f_Log) log_i("AAC PID discover");
pidOfAAC= elementaryPID; pidOfAAC= elementaryPID;
} }
int esInfoLength = ((packet[PLS + cursor + 3] & 0x0F) << 8) | (packet[PLS + cursor + 4] & 0xFF); int esInfoLength = ((packet[PLS + cursor + 3] & 0x0F) << 8) | (packet[PLS + cursor + 4] & 0xFF);
if(debug) printf("ES Info Length: 0x%04X\n", esInfoLength); if(m_f_Log) log_i("ES Info Length: 0x%04X", esInfoLength);
cursor += 5 + esInfoLength; cursor += 5 + esInfoLength;
} }
} }
...@@ -4674,7 +4680,7 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe ...@@ -4674,7 +4680,7 @@ bool Audio::ts_parsePacket(uint8_t* packet, uint8_t* packetStart, uint8_t* packe
*packetLength = 0; *packetLength = 0;
return true; return true;
} }
// log_e("invalid ts packet!"); if(m_f_Log) log_e("invalid ts packet!");
return false; return false;
} }
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
src/Audio.h
View file @ a4ae2188
...@@ -511,7 +511,7 @@ private: ...@@ -511,7 +511,7 @@ private:
bool m_f_internalDAC = false; // false: output vis I2S, true output via internal DAC bool m_f_internalDAC = false; // false: output vis I2S, true output via internal DAC
bool m_f_rtsp = false; // set if RTSP is used (m3u8 stream) bool m_f_rtsp = false; // set if RTSP is used (m3u8 stream)
bool m_f_m3u8data = false; // used in processM3U8entries bool m_f_m3u8data = false; // used in processM3U8entries
bool m_f_Log = true; // if m3u8: log is cancelled bool m_f_Log = false; // set in platformio.ini -DAUDIO_LOG and -DCORE_DEBUG_LEVEL=3 or 4
bool m_f_continue = false; // next m3u8 chunk is available bool m_f_continue = false; // next m3u8 chunk is available
bool m_f_ts = true; // transport stream bool m_f_ts = true; // transport stream
uint8_t m_f_channelEnabled = 3; // internal DAC, both channels uint8_t m_f_channelEnabled = 3; // internal DAC, both channels
......
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