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

fixed airplay

Browse Source
This commit is contained in:
philippe44
2019-08-19 20:25:04 -07:00
parent 9caf8deca6
commit 49dcfdc758
8 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/squeezelite/buffer.c
View File

@@ -83,6 +83,7 @@ void buf_adjust(struct buffer *buf, size_t mod) {
// called with mutex locked to resize, does not retain contents, reverts to original size if fails
void _buf_resize(struct buffer *buf, size_t size) {
if (size == buf->size) return;
free(buf->buf);
buf->buf = malloc(size);
if (!buf->buf) {

17
components/squeezelite/decode_external.c
View File

@@ -34,6 +34,8 @@ extern struct buffer *outputbuf;
// this is the only system-wide loglevel variable
extern log_level loglevel;
#define RAOP_OUTPUT_SIZE (RAOP_SAMPLE_RATE * 2 * 2 * 2 * 1.2)
static raop_event_t raop_state;
static bool raop_expect_stop = false;
static struct {
@@ -165,29 +167,34 @@ void raop_sink_cmd_handler(raop_event_t event, void *param)
raop_sync.total += *(s32_t*) param;
raop_sync.count++;
raop_sync.msplayed = now - output.updated + ((u64_t) (output.frames_played_dmp - output.device_frames) * 1000) / 44100;
raop_sync.msplayed = now - output.updated + ((u64_t) (output.frames_played_dmp - output.device_frames) * 1000) / RAOP_SAMPLE_RATE;
error = raop_sync.msplayed - (now - raop_sync.start_time);
LOG_INFO("now:%u updated:%u played_dmp:%u device:%u", now, output.updated, output.frames_played_dmp, output.device_frames);
LOG_INFO("backend played %u, desired %u, (delta:%d raop:%d)", raop_sync.msplayed, now - raop_sync.start_time, error, raop_sync.total / raop_sync.count);
if (error < -10) {
output.skip_frames = (abs(error) * 44100) / 1000;
output.skip_frames = (abs(error) * RAOP_SAMPLE_RATE) / 1000;
output.state = OUTPUT_SKIP_FRAMES;
LOG_INFO("skipping %u frames", output.skip_frames);
} else if (error > 10) {
output.pause_frames = (abs(error) * 44100) / 1000;
output.pause_frames = (abs(error) * RAOP_SAMPLE_RATE) / 1000;
output.state = OUTPUT_PAUSE_FRAMES;
LOG_INFO("pausing for %u frames", output.pause_frames);
}
break;
}
case RAOP_SETUP:
_buf_resize(outputbuf, RAOP_OUTPUT_SIZE);
LOG_INFO("resizing buffer %u", outputbuf->size);
break;
case RAOP_STREAM:
LOG_INFO("Stream", NULL);
raop_state = event;
raop_sync.total = raop_sync.count = 0;
output.external = true;
output.next_sample_rate = 44100;
output.next_sample_rate = RAOP_SAMPLE_RATE;
output.state = OUTPUT_STOPPED;
break;
case RAOP_STOP:

1
components/squeezelite/output.c
View File

@@ -347,6 +347,7 @@ void output_init_common(log_level level, const char *device, unsigned output_buf
loglevel = level;
output_buf_size = output_buf_size - (output_buf_size % BYTES_PER_FRAME);
output.init_size = output_buf_size;
LOG_DEBUG("outputbuf size: %u", output_buf_size);
buf_init(outputbuf, output_buf_size);

5
components/squeezelite/slimproto.c
View File

@@ -371,7 +371,10 @@ static void process_strm(u8_t *pkt, int len) {
sendSTAT("STMc", 0);
sentSTMu = sentSTMo = sentSTMl = false;
LOCK_O;
output.external = false;
if (output.external) {
output.external = false;
_buf_resize(outputbuf, output.init_size);
}
output.threshold = strm->output_threshold;
output.next_replay_gain = unpackN(&strm->replay_gain);
output.fade_mode = strm->transition_type - '0';

1
components/squeezelite/squeezelite.h
View File

@@ -656,6 +656,7 @@ struct outputstate {
output_format format;
const char *device;
bool external;
u32_t init_size;
#if ALSA
unsigned buffer;
unsigned period;