Skip to content

GitLab

E
ESP32-audioI2S
Commit dd1afff7 authored by schreibfaul1's avatar schreibfaul1
Browse files
Options

some var renamed

parent 5ac109cc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 116 deletions
src/opus_decoder/celt.cpp
View file @ dd1afff7
This diff is collapsed.
src/opus_decoder/opus_decoder.cpp
View file @ dd1afff7
...@@ -21,6 +21,8 @@ uint8_t s_opusChannels = 0; ...@@ -21,6 +21,8 @@ uint8_t s_opusChannels = 0;
uint8_t s_opusCountCode = 0; uint8_t s_opusCountCode = 0;
uint16_t s_opusSamplerate = 0; uint16_t s_opusSamplerate = 0;
uint32_t s_opusSegmentLength = 0; uint32_t s_opusSegmentLength = 0;
uint32_t s_opusBlockPicLen = 0;
uint32_t s_opusBlockPicPos = 0;
char *s_opusChbuf = NULL; char *s_opusChbuf = NULL;
int32_t s_opusValidSamples = 0; int32_t s_opusValidSamples = 0;
...@@ -67,6 +69,7 @@ void OPUSsetDefaults(){ ...@@ -67,6 +69,7 @@ void OPUSsetDefaults(){
s_opusSegmentTableSize = 0; s_opusSegmentTableSize = 0;
s_opusSegmentTableRdPtr = -1; s_opusSegmentTableRdPtr = -1;
s_opusCountCode = 0; s_opusCountCode = 0;
s_opusBlockPicPos = 0;
s_opusError = 0; s_opusError = 0;
} }
...@@ -311,7 +314,17 @@ int parseOpusComment(uint8_t *inbuf, int nBytes){ // reference https://exif ...@@ -311,7 +314,17 @@ int parseOpusComment(uint8_t *inbuf, int nBytes){ // reference https://exif
idx = OPUS_specialIndexOf(inbuf + pos, "title=", 10); idx = OPUS_specialIndexOf(inbuf + pos, "title=", 10);
if(idx == 0){ title = strndup((const char*)(inbuf + pos + 6), commentStringLen - 6); if(idx == 0){ title = strndup((const char*)(inbuf + pos + 6), commentStringLen - 6);
} }
idx = OPUS_specialIndexOf(inbuf + pos, "metadata_block_picture=", 25);
if(idx == -1) idx = OPUS_specialIndexOf(inbuf + pos, "METADATA_BLOCK_PICTURE=", 25);
if(idx == 0){
s_opusBlockPicLen = commentStringLen - 23;
s_opusBlockPicPos += pos + 23;
uint16_t blockPicLenUntilFrameEnd = commentStringLen - 23;
log_i("metadata block picture found at pos %i, length %i, first blockLength %i", s_opusBlockPicPos, s_opusBlockPicLen, blockPicLenUntilFrameEnd);
s_opusBlockPicLen -= blockPicLenUntilFrameEnd;
}
pos += commentStringLen; pos += commentStringLen;
} }
if(artist && title){ if(artist && title){
strcpy(s_opusChbuf, artist); strcpy(s_opusChbuf, artist);
...@@ -419,14 +432,17 @@ int OPUSparseOGG(uint8_t *inbuf, int *bytesLeft){ // reference https://www.xiph ...@@ -419,14 +432,17 @@ int OPUSparseOGG(uint8_t *inbuf, int *bytesLeft){ // reference https://www.xiph
bool firstPage = headerType & 0x02; // set: this is the first page of a logical bitstream (bos) bool firstPage = headerType & 0x02; // set: this is the first page of a logical bitstream (bos)
bool lastPage = headerType & 0x04; // set: this is the last page of a logical bitstream (eos) bool lastPage = headerType & 0x04; // set: this is the last page of a logical bitstream (eos)
// log_i("page %x", headerType );
uint16_t headerSize = pageSegments + 27; uint16_t headerSize = pageSegments + 27;
(void)continuedPage; (void)lastPage; (void)continuedPage; (void)lastPage;
*bytesLeft -= headerSize; *bytesLeft -= headerSize;
s_opusBlockPicPos += headerSize;
if(firstPage || s_f_opusSubsequentPage){ // OpusHead or OggComment may follows if(firstPage || s_f_opusSubsequentPage){ // OpusHead or OggComment may follows
ret = parseOpusHead(inbuf + headerSize, s_opusSegmentTable[0]); ret = parseOpusHead(inbuf + headerSize, s_opusSegmentTable[0]);
if(ret == 1) *bytesLeft -= s_opusSegmentTable[0]; if(ret == 1){ *bytesLeft -= s_opusSegmentTable[0]; s_opusBlockPicPos += s_opusSegmentTable[0];}
if(ret < 0){ *bytesLeft -= s_opusSegmentTable[0]; return ret;} if(ret < 0){ *bytesLeft -= s_opusSegmentTable[0]; s_opusBlockPicPos += s_opusSegmentTable[0]; return ret;}
ret = parseOpusComment(inbuf + headerSize, s_opusSegmentTable[0]); ret = parseOpusComment(inbuf + headerSize, s_opusSegmentTable[0]);
if(ret == 1) *bytesLeft -= s_opusSegmentTable[0]; if(ret == 1) *bytesLeft -= s_opusSegmentTable[0];
if(ret < 0){ *bytesLeft -= s_opusSegmentTable[0]; return ret;} if(ret < 0){ *bytesLeft -= s_opusSegmentTable[0]; return ret;}
......
src/vorbis_decoder/vorbis_decoder.cpp
View file @ dd1afff7
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* adapted for the ESP32 by schreibfaul1 * adapted for the ESP32 by schreibfaul1
* *
* Created on: 13.02.2023 * Created on: 13.02.2023
* Updated on: 08.01.2023 * Updated on: 03.02.2024
*/ */
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
// O G G I M P L. // O G G I M P L.
...@@ -40,7 +40,7 @@ bool s_f_oggLastPage = false; ...@@ -40,7 +40,7 @@ bool s_f_oggLastPage = false;
bool s_f_parseOggDone = true; bool s_f_parseOggDone = true;
bool s_f_lastSegmentTable = false; bool s_f_lastSegmentTable = false;
uint16_t s_identificatonHeaderLength = 0; uint16_t s_identificatonHeaderLength = 0;
uint16_t s_commentHeaderLength = 0; uint16_t s_vorbisCommentHeaderLength = 0;
uint16_t s_setupHeaderLength = 0; uint16_t s_setupHeaderLength = 0;
uint8_t s_pageNr = 4; uint8_t s_pageNr = 4;
uint16_t s_oggHeaderSize = 0; uint16_t s_oggHeaderSize = 0;
...@@ -54,8 +54,8 @@ char *s_vorbisChbuf = NULL; ...@@ -54,8 +54,8 @@ char *s_vorbisChbuf = NULL;
int32_t s_vorbisValidSamples = 0; int32_t s_vorbisValidSamples = 0;
uint8_t s_vorbisOldMode = 0; uint8_t s_vorbisOldMode = 0;
uint32_t s_blocksizes[2]; uint32_t s_blocksizes[2];
uint32_t s_blockPicPos = 0; uint32_t s_vorbisBlockPicPos = 0;
uint32_t s_blockPicLen = 0; uint32_t s_vorbisBlockPicLen = 0;
uint32_t s_commentLength = 0; uint32_t s_commentLength = 0;
uint8_t s_nrOfCodebooks = 0; uint8_t s_nrOfCodebooks = 0;
...@@ -120,8 +120,8 @@ void VORBISsetDefaults(){ ...@@ -120,8 +120,8 @@ void VORBISsetDefaults(){
s_vorbisSegmentTableRdPtr = -1; s_vorbisSegmentTableRdPtr = -1;
s_vorbisError = 0; s_vorbisError = 0;
s_lastSegmentTableLen = 0; s_lastSegmentTableLen = 0;
s_blockPicPos = 0; s_vorbisBlockPicPos = 0;
s_blockPicLen = 0; s_vorbisBlockPicLen = 0;
VORBISDecoder_ClearBuffers(); VORBISDecoder_ClearBuffers();
} }
...@@ -205,7 +205,7 @@ int VORBISDecode(uint8_t *inbuf, int *bytesLeft, short *outbuf){ ...@@ -205,7 +205,7 @@ int VORBISDecode(uint8_t *inbuf, int *bytesLeft, short *outbuf){
// log_i("first packet (identification len) %i", len); // log_i("first packet (identification len) %i", len);
s_identificatonHeaderLength = len; s_identificatonHeaderLength = len;
ret = parseVorbisFirstPacket(inbuf, len); ret = parseVorbisFirstPacket(inbuf, len);
s_blockPicPos += 28; s_vorbisBlockPicPos += 28;
} }
else{ else{
ret = ERR_VORBIS_NOT_AUDIO; // #651 ret = ERR_VORBIS_NOT_AUDIO; // #651
...@@ -213,16 +213,16 @@ int VORBISDecode(uint8_t *inbuf, int *bytesLeft, short *outbuf){ ...@@ -213,16 +213,16 @@ int VORBISDecode(uint8_t *inbuf, int *bytesLeft, short *outbuf){
} }
else if(s_pageNr == 2){ // comment header else if(s_pageNr == 2){ // comment header
int idx = VORBIS_specialIndexOf(inbuf, "vorbis", 10); int idx = VORBIS_specialIndexOf(inbuf, "vorbis", 10);
s_blockPicPos += 6; s_vorbisBlockPicPos += 6;
if(idx == 1){ if(idx == 1){
// log_i("second packet (comment len) %i", len); // log_i("second packet (comment len) %i", len);
s_commentHeaderLength = len; s_vorbisCommentHeaderLength = len;
ret = parseVorbisComment(inbuf, len); ret = parseVorbisComment(inbuf, len);
} }
else{ else{
uint16_t blockLen = len; uint16_t blockLen = len;
// log_i("blockPicLen %i blockLen %i", s_blockPicLen, blockLen); // log_i("blockPicLen %i blockLen %i", s_blockPicLen, blockLen);
s_blockPicLen -= blockLen; s_vorbisBlockPicLen -= blockLen;
; // commentlength is greater than (one or more) OggS frame(s) ; // commentlength is greater than (one or more) OggS frame(s)
} }
// log_w("s_vorbisSegmentTableSize %d", s_vorbisSegmentTableSize); // log_w("s_vorbisSegmentTableSize %d", s_vorbisSegmentTableSize);
...@@ -443,7 +443,7 @@ int parseVorbisComment(uint8_t *inbuf, int16_t nBytes){ // reference https: ...@@ -443,7 +443,7 @@ int parseVorbisComment(uint8_t *inbuf, int16_t nBytes){ // reference https:
memcpy(s_vorbisChbuf, inbuf + 11, vendorLength); memcpy(s_vorbisChbuf, inbuf + 11, vendorLength);
s_vorbisChbuf[vendorLength] = '\0'; s_vorbisChbuf[vendorLength] = '\0';
pos += 4 + vendorLength; pos += 4 + vendorLength;
s_commentHeaderLength -= (7 + 4 + vendorLength); s_vorbisCommentHeaderLength -= (7 + 4 + vendorLength);
// log_i("vendorLength %x", vendorLength); // log_i("vendorLength %x", vendorLength);
// log_i("vendorString %s", s_vorbisChbuf); // log_i("vendorString %s", s_vorbisChbuf);
...@@ -451,7 +451,7 @@ int parseVorbisComment(uint8_t *inbuf, int16_t nBytes){ // reference https: ...@@ -451,7 +451,7 @@ int parseVorbisComment(uint8_t *inbuf, int16_t nBytes){ // reference https:
uint8_t nrOfComments = *(inbuf + pos); uint8_t nrOfComments = *(inbuf + pos);
// log_i("nrOfComments %i", nrOfComments); // log_i("nrOfComments %i", nrOfComments);
pos += 4; pos += 4;
s_commentHeaderLength -= 4; s_vorbisCommentHeaderLength -= 4;
int idx = 0; int idx = 0;
char* artist = NULL; char* artist = NULL;
...@@ -481,14 +481,14 @@ int parseVorbisComment(uint8_t *inbuf, int16_t nBytes){ // reference https: ...@@ -481,14 +481,14 @@ int parseVorbisComment(uint8_t *inbuf, int16_t nBytes){ // reference https:
idx = VORBIS_specialIndexOf((uint8_t*)s_vorbisChbuf, "metadata_block_picture=", 25); idx = VORBIS_specialIndexOf((uint8_t*)s_vorbisChbuf, "metadata_block_picture=", 25);
if(idx == 0){ if(idx == 0){
s_blockPicLen = commentLength - 23; s_vorbisBlockPicLen = commentLength - 23;
s_blockPicPos += pos + 23; s_vorbisBlockPicPos += pos + 23;
uint16_t blockPicLenUntilFrameEnd = s_commentHeaderLength - 4 - 23; uint16_t blockPicLenUntilFrameEnd = s_vorbisCommentHeaderLength - 4 - 23;
log_i("metadata block picture found at pos %i, length %i, first blockLength %i", s_blockPicPos, s_blockPicLen, blockPicLenUntilFrameEnd); log_i("metadata block picture found at pos %i, length %i, first blockLength %i", s_vorbisBlockPicPos, s_vorbisBlockPicLen, blockPicLenUntilFrameEnd);
s_blockPicLen -= blockPicLenUntilFrameEnd; s_vorbisBlockPicLen -= blockPicLenUntilFrameEnd;
} }
pos += commentLength + 4; pos += commentLength + 4;
s_commentHeaderLength -= (4 + commentLength); s_vorbisCommentHeaderLength -= (4 + commentLength);
} }
if(artist && title){ if(artist && title){
strcpy(s_vorbisChbuf, artist); strcpy(s_vorbisChbuf, artist);
...@@ -622,7 +622,7 @@ int VORBISparseOGG(uint8_t *inbuf, int *bytesLeft){ ...@@ -622,7 +622,7 @@ int VORBISparseOGG(uint8_t *inbuf, int *bytesLeft){
if(s_f_oggContinuedPage) return ERR_VORBIS_DECODER_ASYNC; if(s_f_oggContinuedPage) return ERR_VORBIS_DECODER_ASYNC;
inbuf += idx; inbuf += idx;
*bytesLeft -= idx; *bytesLeft -= idx;
s_blockPicPos += idx; s_vorbisBlockPicPos += idx;
} }
int16_t segmentTableWrPtr = -1; int16_t segmentTableWrPtr = -1;
...@@ -682,7 +682,7 @@ int VORBISparseOGG(uint8_t *inbuf, int *bytesLeft){ ...@@ -682,7 +682,7 @@ int VORBISparseOGG(uint8_t *inbuf, int *bytesLeft){
} }
*bytesLeft -= headerSize; *bytesLeft -= headerSize;
s_blockPicPos += headerSize; s_vorbisBlockPicPos += headerSize;
if(s_pageNr < 4 && !continuedPage) s_pageNr++; if(s_pageNr < 4 && !continuedPage) s_pageNr++;
s_f_oggFirstPage = firstPage; s_f_oggFirstPage = firstPage;
......
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