mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-09 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

raop: Remove unimplemented code (PCM and AAC)

Browse source
This commit is contained in:
Martin Blanchard 2016-11-06 12:54:11 -06:00 • committed by Tanu Kaskinen
parent 750a677b43
commit 1c56b86926
1 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/modules/raop/raop-client.c
View file

@ -267,16 +267,6 @@ static inline void bit_writer(uint8_t **buffer, uint8_t *bit_pos, size_t *size,
} }
} }
static size_t write_PCM_data(uint8_t *packet, const size_t max, uint8_t *raw, size_t *length) {
size_t size = 0;
pa_memzero(packet, max);
pa_log("Raw PCM not implemented...");
return size;
}
static size_t write_ALAC_data(uint8_t *packet, const size_t max, uint8_t *raw, size_t *length, bool compress) { static size_t write_ALAC_data(uint8_t *packet, const size_t max, uint8_t *raw, size_t *length, bool compress) {
uint32_t nbs = (*length / 2) / 2; uint32_t nbs = (*length / 2) / 2;
uint8_t *ibp, *maxibp; uint8_t *ibp, *maxibp;
@ -315,16 +305,6 @@ static size_t write_ALAC_data(uint8_t *packet, const size_t max, uint8_t *raw, s
return size; return size;
} }
static size_t write_AAC_data(uint8_t *packet, const size_t max, uint8_t *raw, size_t *length) {
size_t size = 0;
pa_memzero(packet, max);
pa_log("AAC encoding not implemented...");
return size;
}
static size_t build_tcp_audio_packet(pa_raop_client *c, pa_memchunk *block, pa_memchunk *packet) { static size_t build_tcp_audio_packet(pa_raop_client *c, pa_memchunk *block, pa_memchunk *packet) {
const size_t head = sizeof(tcp_audio_header); const size_t head = sizeof(tcp_audio_header);
uint32_t *buffer = NULL; uint32_t *buffer = NULL;
@ -344,12 +324,14 @@ static size_t build_tcp_audio_packet(pa_raop_client *c, pa_memchunk *block, pa_m
length = block->length; length = block->length;
size = sizeof(tcp_audio_header); size = sizeof(tcp_audio_header);
if (c->codec == PA_RAOP_CODEC_PCM) if (c->codec == PA_RAOP_CODEC_ALAC)
size += write_PCM_data(((uint8_t *) buffer + head), packet->length - head, raw, &length);
else if (c->codec == PA_RAOP_CODEC_ALAC)
size += write_ALAC_data(((uint8_t *) buffer + head), packet->length - head, raw, &length, false); size += write_ALAC_data(((uint8_t *) buffer + head), packet->length - head, raw, &length, false);
else else {
size += write_AAC_data(((uint8_t *) buffer + head), packet->length - head, raw, &length); pa_log_debug("Only ALAC encoding is supported, sending zeros...");
pa_memzero(((uint8_t *) buffer + head), packet->length - head);
size += length;
}
c->rtptime += length / 4; c->rtptime += length / 4;
pa_memblock_release(block->memblock); pa_memblock_release(block->memblock);
@ -430,12 +412,14 @@ static size_t build_udp_audio_packet(pa_raop_client *c, pa_memchunk *block, pa_m
length = block->length; length = block->length;
size = sizeof(udp_audio_header); size = sizeof(udp_audio_header);
if (c->codec == PA_RAOP_CODEC_PCM) if (c->codec == PA_RAOP_CODEC_ALAC)
size += write_PCM_data(((uint8_t *) buffer + head), packet->length - head, raw, &length);
else if (c->codec == PA_RAOP_CODEC_ALAC)
size += write_ALAC_data(((uint8_t *) buffer + head), packet->length - head, raw, &length, false); size += write_ALAC_data(((uint8_t *) buffer + head), packet->length - head, raw, &length, false);
else else {
size += write_AAC_data(((uint8_t *) buffer + head), packet->length - head, raw, &length); pa_log_debug("Only ALAC encoding is supported, sending zeros...");
pa_memzero(((uint8_t *) buffer + head), packet->length - head);
size += length;
}
c->rtptime += length / 4; c->rtptime += length / 4;
c->seq++; c->seq++;