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

fix opus & vorbis resampling

Browse Source
This commit is contained in:
Philippe G
2020-07-27 14:33:43 -07:00
parent da1aa2e74e
commit dfe468b610
5 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
components/squeezelite/opus.c
View File

@@ -30,7 +30,9 @@
* thread has a higher priority. Using an interim buffer where opus decoder writes the output is not great from
* an efficiency (one extra memory copy) point of view, but it allows the lock to not be kept for too long
*/
#if EMBEDDED
#define FRAME_BUF 2048
#endif
#if BYTES_PER_FRAME == 4
#define ALIGN(n) (n)
@@ -151,16 +153,14 @@ static decode_state opus_decompress(void) {
LOG_INFO("setting track_start");
}
#if !FRAME_BUF
LOCK_O_direct;
#endif
#if FRAME_BUF
IF_DIRECT(
frames = min(_buf_space(outputbuf), _buf_cont_write(outputbuf)) / BYTES_PER_FRAME;
frames = min(frames, FRAME_BUF);
write_buf = u->write_buf;
);
#else
LOCK_O_direct;
IF_DIRECT(
frames = min(_buf_space(outputbuf), _buf_cont_write(outputbuf)) / BYTES_PER_FRAME;
write_buf = outputbuf->writep;
@@ -171,10 +171,7 @@ static decode_state opus_decompress(void) {
write_buf = process.inbuf;
);
#if FRAME_BUF
frames = min(frames, FRAME_BUF);
#endif
//printf("processing %u frames\n", frames);
// write the decoded frames into outputbuf then unpack them (they are 16 bits)
n = OP(u, read, u->of, (opus_int16*) write_buf, frames * channels, NULL);
@@ -190,15 +187,21 @@ static decode_state opus_decompress(void) {
frames = n;
count = frames * channels;
iptr = (s16_t *)write_buf + count;
optr = (ISAMPLE_T *) outputbuf->writep + frames * 2;
// work backward to unpack samples (if needed)
iptr = (s16_t *) write_buf + count;
optr = (ISAMPLE_T *) write_buf + frames * 2;
if (channels == 2) {
#if BYTES_PER_FRAME == 4
memcpy(outputbuf->writep, write_buf, frames * BYTES_PER_FRAME);
#if FRAME_BUF
// copy needed only when DIRECT and FRAME_BUF
IF_DIRECT(
memcpy(outputbuf->writep, write_buf, frames * BYTES_PER_FRAME);
)
#endif
#else
while (count--) {
*--optr = *--iptr << 16;
*--optr = ALIGN(*--iptr);
}
#endif
} else if (channels == 1) {
@@ -298,8 +301,8 @@ struct codec *register_opus(void) {
static struct codec ret = {
'u', // id
"ops", // types
4096, // min read
20480, // min space
4*1024, // min read
32*1024, // min space
opus_open, // open
opus_close, // close
opus_decompress, // decode
@@ -311,7 +314,9 @@ struct codec *register_opus(void) {
}
u->of = NULL;
#if FRAME_BUF
u->write_buf = NULL;
#endif
if (!load_opus()) {
return NULL;