Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-08 12:37:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

AAC 32 bits mode correction

Browse Source
This commit is contained in:
Philippe G
2021-03-11 12:59:34 -08:00
parent b9466bf7b2
commit e8bba8af24
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/squeezelite/helix-aac.c
View File

@@ -30,7 +30,7 @@
#if BYTES_PER_FRAME == 4 #if BYTES_PER_FRAME == 4
#define ALIGN(n) (n) #define ALIGN(n) (n)
#else #else
#define ALIGN(n) (n << 8) #define ALIGN(n) (n << 16)
#endif #endif
#define WRAPBUF_LEN 2048 #define WRAPBUF_LEN 2048
@@ -332,7 +332,7 @@ static decode_state helixaac_decode(void) {
size_t bytes_total, bytes_wrap; size_t bytes_total, bytes_wrap;
int res, bytes; int res, bytes;
static AACFrameInfo info; static AACFrameInfo info;
ISAMPLE_T *iptr; s16_t *iptr;
u8_t *sptr; u8_t *sptr;
bool endstream; bool endstream;
frames_t frames; frames_t frames;
@@ -372,7 +372,7 @@ static decode_state helixaac_decode(void) {
u8_t *p = streambuf->readp + n; u8_t *p = streambuf->readp + n;
int bytes = bytes_wrap - n; int bytes = bytes_wrap - n;
if (!HAAC(a, Decode, a->hAac, &p, &bytes, (short*) a->write_buf)) { if (!HAAC(a, Decode, a->hAac, &p, &bytes, (s16_t*) a->write_buf)) {
HAAC(a, GetLastFrameInfo, a->hAac, &info); HAAC(a, GetLastFrameInfo, a->hAac, &info);
channels = info.nChans; channels = info.nChans;
samplerate = info.sampRateOut; samplerate = info.sampRateOut;
@@ -443,13 +443,13 @@ static decode_state helixaac_decode(void) {
} }
// decode function changes iptr, so can't use streambuf->readp (same for bytes) // decode function changes iptr, so can't use streambuf->readp (same for bytes)
res = HAAC(a, Decode, a->hAac, &sptr, &bytes, (short*) a->write_buf); res = HAAC(a, Decode, a->hAac, &sptr, &bytes, (s16_t*) a->write_buf);
if (res < 0) { if (res < 0) {
LOG_WARN("AAC decode error %d", res); LOG_WARN("AAC decode error %d", res);
} }
HAAC(a, GetLastFrameInfo, a->hAac, &info); HAAC(a, GetLastFrameInfo, a->hAac, &info);
iptr = (ISAMPLE_T *) a->write_buf; iptr = (s16_t*) a->write_buf;
bytes = bytes_wrap - bytes; bytes = bytes_wrap - bytes;
endstream = false; endstream = false;
@@ -543,8 +543,8 @@ static decode_state helixaac_decode(void) {
iptr += count * 2; iptr += count * 2;
#else #else
while (count--) { while (count--) {
*optr++ = *iptr++ << 8; *optr++ = ALIGN(*iptr++);
*optr++ = *iptr++ << 8; *optr++ = ALIGN(*iptr++);
} }
#endif #endif
} else if (info.nChans == 1) { } else if (info.nChans == 1) {
@@ -597,7 +597,7 @@ static void helixaac_open(u8_t size, u8_t rate, u8_t chan, u8_t endianness) {
// always free decoder as flush only works when no parameter has changed // always free decoder as flush only works when no parameter has changed
HAAC(a, FreeDecoder, a->hAac); HAAC(a, FreeDecoder, a->hAac);
} else { } else {
a->write_buf = malloc(FRAME_BUF * BYTES_PER_FRAME); a->write_buf = malloc(FRAME_BUF * 4);
a->wrap_buf = malloc(WRAPBUF_LEN); a->wrap_buf = malloc(WRAPBUF_LEN);
} }