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

32 bits mode for AirPlay

Browse Source
This commit is contained in:
Philippe G
2021-03-06 23:04:05 -08:00
parent 1063cd5899
commit b0d8401274
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/squeezelite/decode_external.c
View File

@@ -31,7 +31,9 @@ extern log_level loglevel;
static bool enable_bt_sink; static bool enable_bt_sink;
static bool enable_airplay; static bool enable_airplay;
#define RAOP_OUTPUT_SIZE (RAOP_SAMPLE_RATE * 2 * 2 * 2 * 1.2) static unsigned bt_volume;
#define RAOP_OUTPUT_SIZE (((RAOP_SAMPLE_RATE * BYTES_PER_FRAME * 2 * 120) / 100) & ~BYTES_PER_FRAME)
#define SYNC_WIN_SLOW 32 #define SYNC_WIN_SLOW 32
#define SYNC_WIN_CHECK 8 #define SYNC_WIN_CHECK 8
#define SYNC_WIN_FAST 2 #define SYNC_WIN_FAST 2
@@ -63,19 +65,19 @@ static void sink_data_handler(const uint8_t *data, uint32_t len)
while (len) { while (len) {
LOCK_O; LOCK_O;
bytes = min(_buf_space(outputbuf), _buf_cont_write(outputbuf)); bytes = min(_buf_space(outputbuf), _buf_cont_write(outputbuf)) / (BYTES_PER_FRAME / 4);
bytes = min(len, bytes); bytes = min(len, bytes);
#if BYTES_PER_FRAME == 4 #if BYTES_PER_FRAME == 4
memcpy(outputbuf->writep, data, bytes); memcpy(outputbuf->writep, data, bytes);
#else #else
{ {
s16_t *iptr = (s16_t*) data; s16_t *iptr = (s16_t*) data;
ISAMPLE_T *optr = (ISAMPLE_T*) outputbuf->writep; ISAMPLE_T *optr = (ISAMPLE_T *) outputbuf->writep;
size_t n = bytes / BYTES_PER_FRAME * 2; size_t n = bytes / 2;
while (n--) *optr++ = *iptr++ << 16; while (n--) *optr++ = *iptr++ << 16;
} }
#endif #endif
_buf_inc_writep(outputbuf, bytes); _buf_inc_writep(outputbuf, bytes * BYTES_PER_FRAME / 4);
space = _buf_space(outputbuf); space = _buf_space(outputbuf);
len -= bytes; len -= bytes;
@@ -106,10 +108,12 @@ static bool bt_sink_cmd_handler(bt_sink_cmd_t cmd, va_list args)
LOCK_D; LOCK_D;
if (cmd != BT_SINK_VOLUME) LOCK_O; if (cmd != BT_SINK_VOLUME && cmd != BT_SINK_AUDIO_STARTED) LOCK_O;
switch(cmd) { switch(cmd) {
case BT_SINK_AUDIO_STARTED: case BT_SINK_AUDIO_STARTED:
if (output.external != DECODE_BT) set_volume(bt_volume, bt_volume);
LOCK_O;
output.next_sample_rate = output.current_sample_rate = va_arg(args, u32_t); output.next_sample_rate = output.current_sample_rate = va_arg(args, u32_t);
output.external = DECODE_BT; output.external = DECODE_BT;
output.state = OUTPUT_STOPPED; output.state = OUTPUT_STOPPED;
@@ -147,6 +151,7 @@ static bool bt_sink_cmd_handler(bt_sink_cmd_t cmd, va_list args)
u32_t volume = va_arg(args, u32_t); u32_t volume = va_arg(args, u32_t);
volume = 65536 * powf(volume / 128.0f, 3); volume = 65536 * powf(volume / 128.0f, 3);
set_volume(volume, volume); set_volume(volume, volume);
bt_volume = volume;
break; break;
default: default:
break; break;
@@ -188,7 +193,6 @@ static bool raop_sink_cmd_handler(raop_event_t event, va_list args)
// this is async, so player might have been deleted // this is async, so player might have been deleted
switch (event) { switch (event) {
case RAOP_TIMING: { case RAOP_TIMING: {
if (!raop_sync.enabled || output.state != OUTPUT_RUNNING || output.frames_played_dmp < output.device_frames) break; if (!raop_sync.enabled || output.state != OUTPUT_RUNNING || output.frames_played_dmp < output.device_frames) break;
u32_t ms, now = gettime_ms(); u32_t ms, now = gettime_ms();